Merge remote-tracking branch 'origin/master'

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/ApsProcessOperationService.java

@@ -1,7 +1,7 @@
 package com.rongwei.bscommon.sys.service;
 
-import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.rongwei.bsentity.domain.ApsProcessOperationDo;
 import com.rongwei.bsentity.domain.ApsProcessOperationOutMaterDo;
 import com.rongwei.rwcommon.base.R;
 
@@ -35,7 +35,7 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     /*
     更新后面所有工序信息
      */
-    List<ApsProcessOperationOutMaterDo> resetProcessOperation(List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList);
+    R resetProcessOperation(List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList);
 
     R updateBorrowProcess(Map<String, Object> params);
 
@@ -44,4 +44,6 @@ public interface ApsProcessOperationService extends IService<ApsProcessOperation
     R backupRestoreProcessOperation();
 
     R cancelConflict(List<String> ids);
+
+    R updateProcess(Map<String, Object> params);
 }

cx-aps/cx-aps-entity/src/main/java/com/rongwei/bsentity/domain/ApsProcessOutputProductDo.java

@@ -213,5 +213,185 @@ public class ApsProcessOutputProductDo extends BaseDo {
      */
     private String changealloystatus;
 
+    /**
+     * 技术要求详情
+     */
+    private String technicalrequirement;
+
+    /**
+     * 坯料类型
+     */
+    private String blanktype;
+
+    /**
+     * 成分调整
+     */
+    private String compositionchange;
+
+    /**
+     * 调整方案
+     */
+    private String changeremark;
+
+    /**
+     * 坯料厚度
+     */
+    private String blamkthickness;
+
+    /**
+     * 坯料均质
+     */
+    private String blankhomogenization;
+
+    /**
+     * 终轧温度
+     */
+    private String finishtemperature;
+
+    /**
+     * 厚度公差（H）
+     */
+    private String thicknesstolerance;
+
+    /**
+     * 宽度公差（W）
+     */
+    private String widthtolerance;
+
+    /**
+     * 长度公差（L）
+     */
+    private String lengthtolerance;
+
+    /**
+     * 折弯要求
+     */
+    private String bendrequirement;
+
+    /**
+     * 接头（率）
+     */
+    private String joint;
+
+    /**
+     * 刷水/达因值
+     */
+    private String swabbing;
+
+    /**
+     * 抗拉强度
+     */
+    private String tensilestrength;
+
+    /**
+     * 屈服强度
+     */
+    private String yieldstrength;
+
+    /**
+     * 延伸率
+     */
+    private String elongationrate;
+
+    /**
+     * 针孔
+     */
+    private String pinhole;
+
+    /**
+     * 杯突
+     */
+    private String cupping;
+
+    /**
+     * 制耳
+     */
+    private String earing;
+
+    /**
+     * 管内芯直径（mm）
+     */
+    private BigDecimal innercorediameter;
+
+    /**
+     * 管芯材质
+     */
+    private String corematerial;
+
+    /**
+     * 包装方式
+     */
+    private String packagingmethod;
+
+    /**
+     * 包装要求
+     */
+    private String packagingrequirement;
+
+    /**
+     * 托盘要求
+     */
+    private String pallentrequirements;
+
+    /**
+     * 标签要求
+     */
+    private String tag;
+
+    /**
+     * 正反面
+     */
+    private String frontandbacksides;
+
+    /**
+     * 亮暗面
+     */
+    private String surfacerequirement;
+
+    /**
+     * 是否过拉矫
+     */
+    private String istensionlevelling;
+
+    /**
+     * 表面硬度
+     */
+    private String surfacehardness;
+
+    /**
+     * 其他订单执行标准
+     */
+    private String otherorderstandard;
+
+    /**
+     * 是否成熟工艺
+     */
+    private String idmatureprocess;
+
+    /**
+     * 其他注意事项
+     */
+    private String otherprecaution;
+
+    /**
+     * 订单产品类型名称
+     */
+    private String orderproducttype;
+
+    /**
+     * 坯料产品类型名称
+     */
+    private String blankproducttype;
+
+    /**
+     * 订单产品类型
+     */
+    private String orderproducttypeid;
+
+    /**
+     * 坯料产品类型
+     */
+    private String blankproducttypeid;
+
     private static final long serialVersionUID = 1L;
 }

cx-aps/cx-aps-server/src/main/java/com/rongwei/bsserver/controller/ApsProcessOperationController.java

@@ -82,10 +82,7 @@ public class ApsProcessOperationController {
     public R resetProcessOperation(@RequestBody List<ApsProcessOperationOutMaterDo> apsProcessOperationOutMaterDoList) {
         try {
             log.info("更新后面所有工序信息;参数为：{}", apsProcessOperationOutMaterDoList);
-            List<ApsProcessOperationOutMaterDo> resData = apsProcessOperationService.resetProcessOperation(apsProcessOperationOutMaterDoList);
-            if (resData != null && resData.size() > 0) {
-                resetProcessOperation(resData);
-            }
+            apsProcessOperationService.resetProcessOperation(apsProcessOperationOutMaterDoList);
             return R.ok();
         } catch (Exception e) {
             e.printStackTrace();
@@ -95,7 +92,21 @@ public class ApsProcessOperationController {
     }
 
     /**
-     *坯料计划使用备料保存后，更新被借调工序的所有后续工序
+     * 坯料计划修改卷数和单卷重后，更新工序作业相关信息
+     */
+    @PostMapping("/updateProcess")
+    public R updateProcess(@RequestBody Map<String, Object> params) {
+        try {
+            log.info("更新坯料计划的工序;参数为：{}", params);
+            return apsProcessOperationService.updateProcess(params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return R.error("更新坯料计划的工序失败:" + e.getMessage());
+        }
+    }
+
+    /**
+     * 坯料计划使用备料保存后，更新被借调工序的所有后续工序
      */
     @PostMapping("/updateBorrowProcess")
     public R updateBorrowProcess(@RequestBody Map<String, Object> params) {
@@ -110,6 +121,7 @@ public class ApsProcessOperationController {
 
     /**
      * 工序作业备份
+     *
      * @return
      */
     @PostMapping("/backup")
@@ -117,8 +129,10 @@ public class ApsProcessOperationController {
         log.info("开始备份工序作业");
         return apsProcessOperationService.backupProcessOperation();
     }
+
     /**
      * 工序作业备份恢复
+     *
      * @return
      */
     @PostMapping("/backup/restore")
@@ -129,11 +143,12 @@ public class ApsProcessOperationController {
 
     /**
      * 取消工序作业的冲突
+     *
      * @return
      */
     @PostMapping("/cancel/conflict")
     public R cancelConflict(@RequestBody List<String> ids) {
-        log.info("开始根据ID：{}忽略作业冲突信息",ids);
+        log.info("开始根据ID：{}忽略作业冲突信息", ids);
         return apsProcessOperationService.cancelConflict(ids);
     }