diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
index 765b2b3e..7484929c 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/BusinessOrderMapper.xml
@@ -99,6 +99,8 @@
+
+
@@ -171,6 +173,8 @@
+
+
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
index 077b66e2..561250a7 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/CwsettlementMapper.xml
@@ -34,6 +34,8 @@
+
+
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
index 1df49100..0dc0c15a 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingOutboundMapper.xml
@@ -21,6 +21,8 @@
+
+
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
index 5e749e26..6f60d660 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WarehousingStorageMapper.xml
@@ -21,6 +21,8 @@
+
+
diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
index d715edf6..f5a638a4 100644
--- a/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
+++ b/jnpf-java-boot/jnpf-admin/src/main/resources/mapper/scm/WorkOrderMapper.xml
@@ -45,6 +45,8 @@
+
+
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 f464a471..d7fecf71 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
@@ -1494,52 +1494,128 @@ public class BusinessOrderController {
if (type.equals("1")){ //采购订单接口
YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(purchaseOrder)) {
+ BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/ordHead", "POST", JsonUtil.getObjectToString(purchaseOrder));
- if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
+ 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));
- if(ObjectUtil.isNotEmpty(purchaseProductCode) && purchaseProductCode.get("code").equals("200")){
- return ActionResult.success("推送成功");
- }else{
+ if (ObjectUtil.isNotEmpty(purchaseProductCode)) {
+ if (purchaseProductCode.get("code").equals("200")) {
+ businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
+ businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.success("推送成功");
+ }else{
+ businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
+ businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.success("推送采购订单行失败");
+ }
+ } else {
+ businessOrderEntity.setErpMark("N");
+ businessOrderEntity.setErpMassage("ESB返回为空");
+ businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送采购订单行失败");
}
+ }else{
+ businessOrderEntity.setErpMark(purchaseCode.get("code").toString());
+ businessOrderEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.fail("推送采购订单头失败");
+ }
}else{
+ businessOrderEntity.setErpMark("N");
+ businessOrderEntity.setErpMassage("ESB返回为空");
+ businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送采购订单头失败");
}
}
}else if (type.equals("2")){ //销售订单接口
YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id);
if (ObjectUtil.isNotEmpty(saleOrder)){
+ BusinessOrderEntity businessOrderEntity = businessOrderService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/ordHead", "POST", JsonUtil.getObjectToString(saleOrder));
- if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")) {
+ 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 (ObjectUtil.isNotEmpty(saleProductCode) && saleProductCode.get("code").equals("200")){
- return ActionResult.success("推送成功");
- }else{
+ if (ObjectUtil.isNotEmpty(saleProductCode)) {
+ if (saleProductCode.get("code").equals("200")) {
+ businessOrderEntity.setErpMark(saleCode.get("code").toString());
+ businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.success("推送成功");
+ }else{
+ businessOrderEntity.setErpMark(saleCode.get("code").toString());
+ businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.fail("推送销售订单行失败");
+ }
+ } else {
+ businessOrderEntity.setErpMark("N");
+ businessOrderEntity.setErpMassage("ESB返回为空");
+ businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单行失败");
}
+ }else{
+ businessOrderEntity.setErpMark(saleCode.get("code").toString());
+ businessOrderEntity.setErpMassage(saleCode.get("errmsg").toString());
+ businessOrderService.updateById(businessOrderEntity);
+ return ActionResult.fail("推送销售订单头失败");
+ }
}else{
+ businessOrderEntity.setErpMark("N");
+ businessOrderEntity.setErpMassage("ESB返回为空");
+ businessOrderService.updateById(businessOrderEntity);
return ActionResult.fail("推送销售订单头失败");
}
}
} else if (type.equals("3")) { //采购入库接口
List yunguanPurchaseInBoundModelList = warehousingStorageService.purchaseInBoundByYunGuan(id);
if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) {
+ WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getInfo(id);
JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList));
- if (ObjectUtil.isNotEmpty(purchaseCode) && purchaseCode.get("code").equals("200")){
- return ActionResult.success("推送成功");
+ if (ObjectUtil.isNotEmpty(purchaseCode)){
+ if (purchaseCode.get("code").equals("200")) {
+ warehousingStorageEntity.setErpMark(purchaseCode.get("code").toString());
+ warehousingStorageEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+ warehousingStorageService.updateById(warehousingStorageEntity);
+ return ActionResult.success("推送成功");
+ }else{
+ warehousingStorageEntity.setErpMark(purchaseCode.get("code").toString());
+ warehousingStorageEntity.setErpMassage(purchaseCode.get("errmsg").toString());
+ warehousingStorageService.updateById(warehousingStorageEntity);
+ return ActionResult.fail("推送失败");
+ }
}else{
+ warehousingStorageEntity.setErpMark("N");
+ warehousingStorageEntity.setErpMassage("ESB返回为空");
+ warehousingStorageService.updateById(warehousingStorageEntity);
return ActionResult.fail("推送失败");
}
}
} else if (type.equals("4")) { //销售出库接口
List yunguanSaleOutBoundModelList = warehousingOutboundService.saleOutBoundByYunGuan(id);
if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) {
+ WarehousingOutboundEntity warehousingOutboundEntity = warehousingOutboundService.getInfo(id);
JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList));
- if (ObjectUtil.isNotEmpty(saleCode) && saleCode.get("code").equals("200")){
- return ActionResult.success("推送成功");
- }else {
+ if (ObjectUtil.isNotEmpty(saleCode)){
+ if (saleCode.get("code").equals("200")) {
+ warehousingOutboundEntity.setErpMark(saleCode.get("code").toString());
+ warehousingOutboundEntity.setErpMassage(saleCode.get("errmsg").toString());
+ warehousingOutboundService.updateById(warehousingOutboundEntity);
+ return ActionResult.success("推送成功");
+ }else{
+ warehousingOutboundEntity.setErpMark(saleCode.get("code").toString());
+ warehousingOutboundEntity.setErpMassage(saleCode.get("errmsg").toString());
+ warehousingOutboundService.updateById(warehousingOutboundEntity);
+ return ActionResult.fail("推送失败");
+ }
+ }else{
+ warehousingOutboundEntity.setErpMark("N");
+ warehousingOutboundEntity.setErpMassage("ESB返回为空");
+ warehousingOutboundService.updateById(warehousingOutboundEntity);
return ActionResult.fail("推送失败");
}
}
@@ -1547,10 +1623,24 @@ public class BusinessOrderController {
List yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id);
List yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id);
yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1);
+ WorkOrderEntity workOrderEntity = workOrderService.getInfo(id);
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")){
- return ActionResult.success("推送成功");
+ if (ObjectUtil.isNotEmpty(workOrderCode)){
+ if (workOrderCode.get("code").equals("200")) {
+ workOrderEntity.setErpMark(workOrderCode.get("code").toString());
+ workOrderEntity.setErpMassage(workOrderCode.get("errmsg").toString());
+ workOrderService.updateById(workOrderEntity);
+ return ActionResult.success("推送成功");
+ }else{
+ workOrderEntity.setErpMark(workOrderCode.get("code").toString());
+ workOrderEntity.setErpMassage(workOrderCode.get("errmsg").toString());
+ workOrderService.updateById(workOrderEntity);
+ return ActionResult.fail("推送失败");
+ }
}else{
+ workOrderEntity.setErpMark("N");
+ workOrderEntity.setErpMassage("ESB返回为空");
+ workOrderService.updateById(workOrderEntity);
return ActionResult.fail("推送失败");
}
} else if (type.equals("6")) { //采购结算接口
diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
index 555ad0da..26b102b1 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java
@@ -32,6 +32,7 @@ import java.nio.charset.StandardCharsets;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.stream.Collectors;
/**
* Inventory
@@ -823,12 +824,41 @@ public class YunguanInterfaceController {
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanPurchaseOrderModel.getORD_NO());
BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper);
- if (ObjectUtil.isNotEmpty(businessOrderEntity)){
+ if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanPurchaseOrderModel.getREAD_FLAG().equals("N")){
businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG());
businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME());
businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE());
businessOrderService.updateById(businessOrderEntity);
}
+ //更新运管标志
+ String purchaseNo = yunguanPurchaseOrderModel.getORD_NO();
+ boolean inBoundNoExists = redisUtil.exists(purchaseNo);
+ if (inBoundNoExists){
+ QueryWrapper countQueryWrapper = new QueryWrapper<>();
+ countQueryWrapper.lambda().eq(BusinessOrderProductRelationalEntity::getBusinessOrderId,businessOrderEntity.getId());
+ countQueryWrapper.lambda().isNull(BusinessOrderProductRelationalEntity::getDeleteMark);
+ long count = businessOrderProductRelationalService.count(countQueryWrapper);
+ count++;
+ long size = redisUtil.getListSize(purchaseNo);
+ List