【需求】完善创建工序接口

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/chanjet/vo/CreateProcedureVO.java

@@ -3,6 +3,7 @@ package com.chanko.yunxi.mes.module.biz.chanjet.vo;
 import com.chanjet.openapi.sdk.java.AbstractChanjetContent;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Map;
 
@@ -60,6 +61,7 @@ public class CreateProcedureVO extends AbstractChanjetContent {
 
     @Data
     @AllArgsConstructor
+    @NoArgsConstructor
     public static class ProcedureVO {
 
         private String Code;
@@ -75,6 +77,24 @@ public class CreateProcedureVO extends AbstractChanjetContent {
         * */
         private Map<String, String> Workshop;
 
+        /*
+        * "SalaryType": {
+              "Code": "工资类型编码PieceRateWage：计件工资HourWage：计时工资NoAccounting：不核算"
+           }
+        * */
+        private Map<String, String> SalaryType;
+
+        /*
+        * "PieceworkBasis": {
+              "Code": "计件依据编码01：合格数量02：报工数量"
+            }
+        * */
+        private Map<String, String> PieceworkBasis;
+
+        /**
+         * 是否为关键工序
+         */
+        private Boolean keyProcess;
     }
 
 }

mes-module-majoys/mes-module-majoys-biz/src/main/java/com/chanko/yunxi/mes/module/biz/manager/ChanjetManager.java

@@ -251,11 +251,8 @@ public class ChanjetManager {
         }
 
         String finalWCode = wCode;
-        CreateProcedureVO.ProcedureVO dto = new CreateProcedureVO.ProcedureVO(procedure.getCode(), procedure.getName()
-                , ValidStatusEnum.VALID.getCode() == procedure.getStatus()
-                , !StringUtils.isEmpty(wCode) ? new HashMap<String, String>(){{
-                    put("Code", finalWCode);
-                }} : null);
+        // TODO 字段待确认
+        CreateProcedureVO.ProcedureVO dto = new CreateProcedureVO.ProcedureVO();
         SimpleChanjetResponse response = (SimpleChanjetResponse) chanjetSpi.execute(CREATE_PROCEDURE, new CreateProcedureVO(dto));
         if(!response.isSuccess()){
             throw new RuntimeException(response.getMessage());