委托加工更新提交erp优化

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/OrderApiImpl.java

@@ -506,7 +506,7 @@ public class OrderApiImpl implements OrderApi {
             ordDtlDTO.setElementAbbreviation(o.getElementAbbreviation());
             ordDtlDTO.setElementName(o.getElementName());
             ordDtlDTO.setElementCode(o.getElementNumber());
-            ordDtlDTO.setIsEnable(o.getIsEnable() ? "1" : "0");
+            ordDtlDTO.setIsEnable(o.getIsEnable());
             ordDtlDTO.setTaxNum(o.getTaxNumber());
             // ordDtlDTO.setLstQty(o.getForecastQuantity());
             ordDtlDTO.setRmk(o.getRemark());

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/OriginalMaterialProcessingController.java

@@ -44,21 +44,21 @@ public class OriginalMaterialProcessingController {
 
     @PostMapping("/create")
     @Operation(summary = "创建来料加工订单")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:create')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:create','entedOrder:add')")
     public CommonResult<OriginalMaterialProcessingRespVO> createOriginalMaterialProcessingOrder(@Valid @RequestBody OriginalMaterialProcessingSaveReqVO createReqVO) {
         return success(originalMaterialProcessingService.createOriginalMaterialProcessing(createReqVO));
     }
 
     @PostMapping("/create-batch")
     @Operation(summary = "批量创建来料加工订单")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:create','entedOrder:add')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:create','entedOrder:add')")
     public CommonResult<List<OriginalMaterialProcessingRespVO>> createBatchOriginalMaterialProcessingOrder(@Valid @RequestBody List<OriginalMaterialProcessingSaveReqVO> createReqVOS) {
         return success(originalMaterialProcessingService.createBatchOriginalMaterialProcessing(createReqVOS));
     }
 
     @PutMapping("/update")
     @Operation(summary = "更新来料加工订单")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:update','entedOrder:add')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:update','entedOrder:add')")
     public CommonResult<Boolean> updateOriginalMaterialProcessingOrder(@Valid @RequestBody OriginalMaterialProcessingSaveReqVO updateReqVO) {
         originalMaterialProcessingService.updateOriginalMaterialProcessing(updateReqVO);
         return success(true);
@@ -67,7 +67,7 @@ public class OriginalMaterialProcessingController {
     @DeleteMapping("/delete")
     @Operation(summary = "删除来料加工订单")
     @Parameter(name = "id", description = "编号", required = true)
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete','entedOrder:edit')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:delete','entedOrder:edit')")
     public CommonResult<Boolean> deleteOriginalMaterialProcessingOrder(@RequestParam("id") Long id) {
         originalMaterialProcessingService.deleteOriginalMaterialProcessing(id);
         return success(true);
@@ -76,7 +76,7 @@ public class OriginalMaterialProcessingController {
     @DeleteMapping("/delete-list")
     @Parameter(name = "ids", description = "编号", required = true)
     @Operation(summary = "批量删除来料加工订单")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:delete','entedOrder:edit')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:delete','entedOrder:edit')")
     public CommonResult<Boolean> deleteOriginalMaterialProcessingOrderList(@RequestBody BatchDeleteReqVO req) {
         originalMaterialProcessingService.deleteOriginalMaterialProcessingListByIds(req.getIds());
         return success(true);
@@ -85,7 +85,7 @@ public class OriginalMaterialProcessingController {
     @GetMapping("/get")
     @Operation(summary = "获得来料加工订单")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:query')")
     public CommonResult<OriginalMaterialProcessingRespVO> getOriginalMaterialProcessingOrder(@RequestParam("id") Long id) {
         OriginalMaterialProcessingDO originalMaterialProcessingDO = originalMaterialProcessingService.getOriginalMaterialProcessing(id);
         OriginalMaterialProcessingRespVO bean = BeanUtils.toBean(originalMaterialProcessingDO, OriginalMaterialProcessingRespVO.class);
@@ -105,7 +105,7 @@ public class OriginalMaterialProcessingController {
 
     @GetMapping("/page")
     @Operation(summary = "获得来料加工订单分页")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:query')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:query')")
     public CommonResult<PageResult<OriginalMaterialProcessingRespVO>> getOriginalMaterialProcessingOrderPage(@Valid OriginalMaterialProcessingPageReqVO pageReqVO) {
         PageResult<OriginalMaterialProcessingDO> pageResult = originalMaterialProcessingService.getOriginalMaterialProcessingPage(pageReqVO);
         PageResult<OriginalMaterialProcessingRespVO> bean = BeanUtils.toBean(pageResult, OriginalMaterialProcessingRespVO.class);
@@ -119,7 +119,7 @@ public class OriginalMaterialProcessingController {
 
     @GetMapping("/export-excel")
     @Operation(summary = "导出来料加工订单 Excel")
-    @PreAuthorize("@ss.hasPermission('base:original-material-processing-order:export')")
+    @PreAuthorize("@ss.hasAnyPermissions('base:original-material-processing-order:export')")
     @ApiAccessLog(operateType = EXPORT)
     public void exportOriginalMaterialProcessingOrderExcel(@Valid OriginalMaterialProcessingPageReqVO pageReqVO,
                                              HttpServletResponse response) throws IOException {

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailPageReqVO.java

@@ -69,7 +69,7 @@ public class OriginalMaterialProcessingDetailPageReqVO extends PageParam {
     private LocalDateTime[] deliveryCargoEndDate;
 
     @Schema(description = "是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     private String shortText;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailRespVO.java

@@ -87,7 +87,7 @@ public class OriginalMaterialProcessingDetailRespVO {
 
     @Schema(description = "是否启用")
     @ExcelProperty("是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     @ExcelProperty("短文本")

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/originalmaterialprocessing/vo/OriginalMaterialProcessingDetailSaveReqVO.java

@@ -72,7 +72,7 @@ public class OriginalMaterialProcessingDetailSaveReqVO {
     private LocalDateTime deliveryCargoEndDate;
 
     @Schema(description = "是否启用")
-    private Boolean isEnable;
+    private String isEnable;
 
     @Schema(description = "短文本")
     private String shortText;

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/originalmaterialprocessing/OriginalMaterialProcessingDetailDO.java

@@ -125,7 +125,7 @@ public class OriginalMaterialProcessingDetailDO extends BusinessBaseDO {
     * 是否启用
     */
     @TableField("IS_ENB")
-    private Boolean isEnable;
+    private String isEnable;
     /**
     * 短文本
     */

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/salesorder/SalesOrderDO.java

@@ -63,7 +63,7 @@ public class SalesOrderDO extends BusinessBaseDO {
     @TableField("SPLR_NAME")
     private String supplierName;
     /**
-    * 订单类型(字典:PRCH_ORD_TP);推送ERP（必须）
+    * 订单类型(字典:SALE_ORD_TP);推送ERP（必须）
     */
     @TableField("TP")
     private String type;