多层订单改造2.0

op-api/op-api-system/src/main/java/com/op/system/api/RemoteSapService.java

@@ -36,7 +36,7 @@ public interface RemoteSapService {
 
     /**回传sap母工单**/
     @PostMapping("/sap/sapCreateOrder")
-    public R<List<Map<String, String>>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList);
+    public R<List<String>> SapCreateOrder(@RequestBody List<SapCreateOrder> sapCreateOrderList);
 
     /**关闭订单**/
     @PostMapping("/sap/sapCloseOrder")

op-api/op-api-system/src/main/java/com/op/system/api/factory/RemoteSapFallbackFactory.java

@@ -35,7 +35,7 @@ public class RemoteSapFallbackFactory implements FallbackFactory<RemoteSapServic
             }
 
             @Override
-            public R<List<Map<String, String>>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
+            public R<List<String>> SapCreateOrder(List<SapCreateOrder> sapCreateOrderList) {
                 return R.fail("回传sap工单失败:" + throwable.getMessage());
             }
 

op-modules/op-plan/src/main/java/com/op/plan/domain/ProOrder.java

@@ -19,7 +19,7 @@ public class ProOrder extends TreeEntity {
 
 	/** ID */
 	private String id;
-
+	private String cegci;
 	/** 计划工厂编码 */
 
 	private String planFactoryCode;
@@ -357,6 +357,14 @@ public class ProOrder extends TreeEntity {
 		this.sortNo = sortNo;
 	}
 
+	public String getCegci() {
+		return cegci;
+	}
+
+	public void setCegci(String cegci) {
+		this.cegci = cegci;
+	}
+
 	@Override
 	public String toString() {
 		return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -355,20 +355,14 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 ordercodes.add(whiteOrder.getOrderCode());
                 Boolean isNotTop = true;
                 //成品的母工单//查下一级工单
+                ProOrderWorkorder queryWorkOrder = whiteOrder;
                 while (isNotTop) {
-                    if(!"0".equals(whiteOrder.getParentOrder())){
-                        //查上一级工单
-                        whiteOrder.setWorkorderCode(whiteOrder.getParentOrder());
-                        ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(whiteOrder);
-                        if (sWorkOrder != null) {
-                            wids.add(sWorkOrder.getWorkorderId());
-                            wcodes.add(sWorkOrder.getWorkorderCode());
-                            ordercodes.add(sWorkOrder.getOrderCode());
-                        }
-                        if ("0".equals(sWorkOrder.getParentOrder())) {
-                            BeanUtils.copyProperties(sWorkOrder, whiteOrder);
-                            isNotTop = false;
-                        }
+                    ProOrderWorkorder sWorkOrder = proOrderWorkorderMapper.getSonWorkOrder(queryWorkOrder);
+                    if (sWorkOrder != null) {
+                        wids.add(sWorkOrder.getWorkorderId());
+                        wcodes.add(sWorkOrder.getWorkorderCode());
+                        ordercodes.add(sWorkOrder.getOrderCode());
+                        queryWorkOrder.setWorkorderCode(sWorkOrder.getWorkorderCode());
                     }else{
                         isNotTop = false;
                     }
@@ -390,7 +384,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 sapList.add(sap);
 
                 logger.info(whiteOrder.getWorkorderCode() + "sap工单回传sap工单号开始：" + JSONObject.toJSONString(sapList));
-                R<List<Map<String, String>>> r = remoteSapService.SapCreateOrder(sapList);
+                R<List<String>> r = remoteSapService.SapCreateOrder(sapList);
                 logger.info("sap工单回传：" + r.getMsg());
                 if (500 == r.getCode()) {
                     logger.error("工单派发sap工单回传：(sap订单创建失败)" + r.getMsg());
@@ -398,12 +392,8 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
                 } else {
                     logger.info("工单派发sap工单回传：(sap订单创建成功)" + JSONObject.toJSONString(r));
                 }
-                List<Map<String, String>> returnMaps = r.getData();
-                List<String> returnCodes = new ArrayList<>();
-                for (Map<String, String> mapdto : returnMaps) {
-                    returnCodes.add(mapdto.get("LEAD_AUFNR"));
-                    returnCodes.add(mapdto.get("AUFNR"));
-                }
+                List<String> returnCodes = r.getData();
+
                 Date updateTime = DateUtils.getNowDate();
                 if (!CollectionUtils.isEmpty(returnCodes)) {
                     logger.info("sap工单回传sap工单号结束：" + StringUtils.join(returnCodes, ","));

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderMapper.xml

@@ -229,6 +229,7 @@
             <if test="carNum != null">car_num,</if>
             <if test="syncUser != null">sync_user,</if>
             from_sap_time,
+            cegci,
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -258,6 +259,7 @@
             <if test="carNum != null">#{carNum},</if>
             <if test="syncUser != null">#{syncUser},</if>
             GETDATE(),
+            #{cegci},
         </trim>
     </insert>
     <insert id="addSapLog">
@@ -294,6 +296,7 @@
             <if test="prodType != null">prod_type = #{prodType},</if>
             <if test="prodSpc != null">prod_spc = #{prodSpc},</if>
             from_sap_time = GETDATE(),
+            cegci = #{cegci},
             <if test="syncUser != null">sync_user = #{syncUser},</if>
         </trim>
         where id = #{id}