楚江ERP：合同导出数据修改，生成订货单数据补充完整，补货单权限修改

@@ -740,7 +740,7 @@ public class ContractDistributorStandardController extends DefaultBaseController
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_INVENTORY_AGMT".equals(data.getType())
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
                                     || "INTL_OPEN_SPEC_AGMT".equals(data.getType())) {
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getProcessingFee()); // I列
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getProcessingFee()); // I列
-                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getProcessingFee().add(contractDistributorLineBo.getUnitPrice())); // K列
+                                setCellValue(sheet, startRow, 10, contractDistributorLineBo.getUnitPrice()); // K列
                             } else {
                             } else {
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
                                 setCellValue(sheet, startRow, 9, contractDistributorLineBo.getUnitPrice()); // I列
                                 setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列
                                 setCellValue(sheet, startRow, 10, contractDistributorLineBo.getAmountExcludingTax()); // K列

-package com.lframework.xingyun.sc.controller.purchase;
+package com.lframework.xingyun.sc.controller.shipments;
 
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -19,7 +19,6 @@ import com.lframework.xingyun.basedata.entity.Workshop;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.customer.CustomerService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.service.workshop.WorkshopService;
 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
 import com.lframework.xingyun.basedata.vo.customer.QueryCustomerVo;
-import com.lframework.xingyun.sc.bo.contract.QueryContractDistributorStandardBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.GetReplenishmentOrderLineBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
 import com.lframework.xingyun.sc.bo.purchase.QueryReplenishmentOrderBo;
@@ -55,7 +54,7 @@ import java.util.stream.Collectors;
 @Api(tags = "补货单")
 @Api(tags = "补货单")
 @Validated
 @Validated
 @RestController
 @RestController
-@RequestMapping("/purchase/replenishmentOrder")
+@RequestMapping("/shipments/replenishmentOrder")
 public class ReplenishmentOrderController extends DefaultBaseController {
 public class ReplenishmentOrderController extends DefaultBaseController {
 
 
     @Resource
     @Resource
@@ -80,7 +79,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"purchase:replenishmentorder:query"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
     public InvokeResult<PageResult<QueryReplenishmentOrderBo>> query(@Valid QueryReplenishmentOrderVo vo) {
         if (vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
         if (vo != null && StringUtils.isNotBlank(vo.getCustomerName())) {
@@ -160,7 +159,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"purchase:replenishmentorder:query"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetReplenishmentOrderBo> get(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -203,7 +202,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"purchase:replenishmentorder:add"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
     public InvokeResult<Void> create(@Valid @RequestBody CreateReplenishmentOrderVo vo) {
 
 
@@ -216,7 +215,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"purchase:replenishmentorder:modify"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
     public InvokeResult<Void> update(@Valid @RequestBody UpdateReplenishmentOrderVo vo) {
 
 
@@ -231,7 +230,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 取消
      * 取消
      */
      */
     @ApiOperation("取消")
     @ApiOperation("取消")
-    @HasPermission({"purchase:replenishmentorder:cancel"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:cancel"})
     @GetMapping("/cancel")
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
 
 
@@ -246,7 +245,7 @@ public class ReplenishmentOrderController extends DefaultBaseController {
      * 填写补货时间
      * 填写补货时间
      */
      */
     @ApiOperation("填写补货时间")
     @ApiOperation("填写补货时间")
-    @HasPermission({"purchase:replenishmentorder:fillRestockTime"})
+    @HasPermission({"shipping-plan-manage:replenishment-order:fill"})
     @PostMapping("/fillRestockTime")
     @PostMapping("/fillRestockTime")
     public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
     public InvokeResult<Void> fillRestockTime(@RequestBody UpdateReplenishmentOrderVo vo) {
 
 

@@ -526,6 +526,15 @@ public class ContractDistributorStandardServiceImpl extends
         createPurchaseOrderInfoVo.setContractCreateById(contractDistributorStandard.getCreateById());
         createPurchaseOrderInfoVo.setContractCreateById(contractDistributorStandard.getCreateById());
         createPurchaseOrderInfoVo.setDeptId(contractDistributorStandard.getDeptId());
         createPurchaseOrderInfoVo.setDeptId(contractDistributorStandard.getDeptId());
         createPurchaseOrderInfoVo.setWorkshopId(contractDistributorStandard.getWorkshopId());
         createPurchaseOrderInfoVo.setWorkshopId(contractDistributorStandard.getWorkshopId());
+        createPurchaseOrderInfoVo.setExecutionStandard(contractDistributorStandard.getExecutionStandard());
+        createPurchaseOrderInfoVo.setExecutionStandardRemarks(contractDistributorStandard.getExecutionStandardRemarks());
+        createPurchaseOrderInfoVo.setPieceWeightHeader(contractDistributorStandard.getPieceWeightHead());
+        createPurchaseOrderInfoVo.setSurface(contractDistributorStandard.getSurface());
+        createPurchaseOrderInfoVo.setTolerance(contractDistributorStandard.getTolerance());
+        createPurchaseOrderInfoVo.setPerformance(contractDistributorStandard.getPerformance());
+        createPurchaseOrderInfoVo.setElement(contractDistributorStandard.getComponent());
+        createPurchaseOrderInfoVo.setPackaging(contractDistributorStandard.getPackaging());
+        createPurchaseOrderInfoVo.setRemarks(contractDistributorStandard.getRemarks());
         createPurchaseOrderInfoVo.setType("NO_PRODUCTION");
         createPurchaseOrderInfoVo.setType("NO_PRODUCTION");
         createPurchaseOrderInfoVo.setExamineStatus("AUDIT");
         createPurchaseOrderInfoVo.setExamineStatus("AUDIT");