添加esb返回信息

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java

@@ -664,14 +664,35 @@ public class CwsettlementController {
                             boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity);
                             if(headFlag){
                                 boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity);
+                                if (lineFlag){
+//                                    entity.setErpMark(saleCode.get("code").toString());
+//                                    entity.setErpMassage(saleCode.get("errmsg").toString());
+                                }else {
+                                    entity.setErpMark("N");
+                                    entity.setErpMassage("ESB返回为空");
+                                }
+                            }else {
+                                entity.setErpMark("N");
+                                entity.setErpMassage("ESB返回为空");
                             }
                         }else{
                             //采购
                             boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity);
                             if(headFlag){
                                 boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity);
+                                if (lineFlag){
+//                                    entity.setErpMark(saleCode.get("code").toString());
+//                                    entity.setErpMassage(saleCode.get("errmsg").toString());
+                                }else {
+                                    entity.setErpMark("N");
+                                    entity.setErpMassage("ESB返回为空");
+                                }
+                            } else {
+                                entity.setErpMark("N");
+                                entity.setErpMassage("ESB返回为空");
                             }
                         }
+                        cwsettlementService.saveOrUpdate(cwsettlementForm,id,false);
                     }
                 }
             }catch(Exception e){

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java

@@ -800,8 +800,21 @@ public class WorkOrderController {
                         List<YunguanProductProcessModel> yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
                         yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
                         JSONObject workOrderCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList));
-                        if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
+                        if(ObjectUtil.isNotEmpty(workOrderCode)){
+                            if (ObjectUtil.isNotEmpty(workOrderCode) && workOrderCode.get("code").equals("200")){
+                                entity.setErpMark(workOrderCode.get("code").toString());
+                                entity.setErpMassage(workOrderCode.get("errmsg").toString());
+                            }else {
+                                entity.setErpMark("N");
+                                entity.setErpMassage("ESB返回为空");
+                            }
+                        }else {
+                            entity.setErpMark("N");
+                            entity.setErpMassage("ESB返回为空");
                         }
+
+                        workOrderService.saveOrUpdate(workOrderForm,id,false);
+
                     }
                 }