diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java index 38728018..3c099826 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/BusinessOrderServiceImpl.java @@ -1082,31 +1082,31 @@ public class BusinessOrderServiceImpl extends ServiceImpl purchaseOrderProduct = businessOrderMapper.queryPurchaseOrderProductByYunGuan(id); - JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); - } - } - } - }else if (entity.getBusinessType().equals("2")){ - YunguanSaleOrderModel saleOrder = businessOrderMapper.querySaleOrderByYunGuan(id); - if (ObjectUtil.isNotEmpty(saleOrder)){ - JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); - if (ObjectUtil.isNotEmpty(saleCode)) { - if (saleCode.get("code").equals("200")) { - List saleOrderProduct = businessOrderMapper.querySaleOrderProductByYunGuan(id); - JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); - } - } - } - } - entity.setFlowId(null); - businessOrderMapper.updateById(entity); +// if (entity.getBusinessType().equals("1")) { +// YunguanPurchaseOrderModel purchaseOrder = businessOrderMapper.queryPurchaseOrderByYunGuan(id); +// if (ObjectUtil.isNotEmpty(purchaseOrder)) { +// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder)); +// if (ObjectUtil.isNotEmpty(purchaseCode)){ +// if (purchaseCode.get("code").equals("200")) { +// List purchaseOrderProduct = businessOrderMapper.queryPurchaseOrderProductByYunGuan(id); +// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); +// } +// } +// } +// }else if (entity.getBusinessType().equals("2")){ +// YunguanSaleOrderModel saleOrder = businessOrderMapper.querySaleOrderByYunGuan(id); +// if (ObjectUtil.isNotEmpty(saleOrder)){ +// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); +// if (ObjectUtil.isNotEmpty(saleCode)) { +// if (saleCode.get("code").equals("200")) { +// List saleOrderProduct = businessOrderMapper.querySaleOrderProductByYunGuan(id); +// JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); +// } +// } +// } +// } +// entity.setFlowId(null); +// businessOrderMapper.updateById(entity); } @Override diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java index ebc10bef..b863657d 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/BusinessOrderController.java @@ -578,29 +578,29 @@ public class BusinessOrderController { }else if(StringUtils.isNotEmpty(entity.getBusinessType()) && entity.getBusinessType().equals("2") && entity.getDeliveryType().equals("2")){ entity.setStatus("4");//销售单直送审核通过后状态改为待出库 } - if (entity.getBusinessType().equals("1")) { - YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id); - if (ObjectUtil.isNotEmpty(purchaseOrder)) { - JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder)); - if (ObjectUtil.isNotEmpty(purchaseCode)){ - if (purchaseCode.get("code").equals("200")) { - List purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id); - JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); - } - } - } - }else if (entity.getBusinessType().equals("2")){ - YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id); - if (ObjectUtil.isNotEmpty(saleOrder)){ - JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); - if (ObjectUtil.isNotEmpty(saleCode)) { - if (saleCode.get("code").equals("200")) { - List saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id); - JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); - } - } - } - } +// if (entity.getBusinessType().equals("1")) { +// YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id); +// if (ObjectUtil.isNotEmpty(purchaseOrder)) { +// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder)); +// if (ObjectUtil.isNotEmpty(purchaseCode)){ +// if (purchaseCode.get("code").equals("200")) { +// List purchaseOrderProduct = businessOrderService.queryPurchaseOrderProductByYunGuanInfo(id); +// JSONObject purchaseProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); +// } +// } +// } +// }else if (entity.getBusinessType().equals("2")){ +// YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id); +// if (ObjectUtil.isNotEmpty(saleOrder)){ +// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder)); +// if (ObjectUtil.isNotEmpty(saleCode)) { +// if (saleCode.get("code").equals("200")) { +// List saleOrderProduct = businessOrderService.querySaleOrderProductByYunGuanInfo(id); +// JSONObject saleProductCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); +// } +// } +// } +// } businessOrderService.saveOrUpdate(entity); } } diff --git a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue index 4d664963..4b54649b 100644 --- a/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue +++ b/jnpf-java-boot/jnpf-web/src/components/Jnpf/PopupSelect/index.vue @@ -1,220 +1,115 @@