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 objList = redisUtil.get(purchaseNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanPurchaseOrderModel.getREAD_FLAG()); + redisUtil.remove(purchaseNo); + redisUtil.insert(purchaseNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + businessOrderEntity.setYunguanMark(yunguanPurchaseOrderModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanPurchaseOrderModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } + redisUtil.remove(purchaseNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderModel.getREAD_FLAG())); + redisUtil.insert(purchaseNo, list); + } } } else if (jsonObject.get("TYPE").equals("采购订单行")) { YunguanPurchaseOrderProductModel yunguanPurchaseOrderProductModel = JsonUtil.getJsonToBean(str,YunguanPurchaseOrderProductModel.class); @@ -853,6 +883,35 @@ public class YunguanInterfaceController { businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE()); businessOrderService.updateById(businessOrderEntity); } + //更新运管标志 + String purchaseNo = yunguanPurchaseOrderProductModel.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 objList = redisUtil.get(purchaseNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanPurchaseOrderProductModel.getREAD_FLAG()); + redisUtil.remove(purchaseNo); + redisUtil.insert(purchaseNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + businessOrderEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } + redisUtil.remove(purchaseNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanPurchaseOrderProductModel.getREAD_FLAG())); + redisUtil.insert(purchaseNo, list); + } } } } else if (jsonObject.get("TYPE").equals("销售订单头")) { @@ -861,12 +920,41 @@ public class YunguanInterfaceController { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.lambda().eq(BusinessOrderEntity::getCode,yunguanSaleOrderModel.getORD_NO()); BusinessOrderEntity businessOrderEntity = businessOrderService.getOne(queryWrapper); - if (ObjectUtil.isNotEmpty(businessOrderEntity)){ + if (ObjectUtil.isNotEmpty(businessOrderEntity) && yunguanSaleOrderModel.getREAD_FLAG().equals("N")){ businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG()); businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME()); businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE()); businessOrderService.updateById(businessOrderEntity); } + //更新运管标志 + String saleNo = yunguanSaleOrderModel.getORD_NO(); + boolean inBoundNoExists = redisUtil.exists(saleNo); + 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(saleNo); + List objList = redisUtil.get(saleNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanSaleOrderModel.getREAD_FLAG()); + redisUtil.remove(saleNo); + redisUtil.insert(saleNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + businessOrderEntity.setYunguanMark(yunguanSaleOrderModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanSaleOrderModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanSaleOrderModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } + redisUtil.remove(saleNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanSaleOrderModel.getREAD_FLAG())); + redisUtil.insert(saleNo, list); + } } } else if (jsonObject.get("TYPE").equals("销售订单行")) { YunguanSaleOrderProductModel yunguanSaleOrderProductModel = JsonUtil.getJsonToBean(str,YunguanSaleOrderProductModel.class); @@ -891,6 +979,35 @@ public class YunguanInterfaceController { businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE()); businessOrderService.updateById(businessOrderEntity); } + //更新运管标志 + String saleNo = yunguanSaleOrderProductModel.getORD_NO(); + boolean inBoundNoExists = redisUtil.exists(saleNo); + 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(saleNo); + List objList = redisUtil.get(saleNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanSaleOrderProductModel.getREAD_FLAG()); + redisUtil.remove(saleNo); + redisUtil.insert(saleNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + businessOrderEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } + redisUtil.remove(saleNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanSaleOrderProductModel.getREAD_FLAG())); + redisUtil.insert(saleNo, list); + } } } } else if (jsonObject.get("TYPE").equals("采购入库")) { @@ -900,31 +1017,6 @@ public class YunguanInterfaceController { warehousingStorageQueryWrapper.lambda().eq(WarehousingStorageEntity::getDocumentNo,yunguanPurchaseInBoundModel.getRECEIPT_NO()); WarehousingStorageEntity warehousingStorageEntity = warehousingStorageService.getOne(warehousingStorageQueryWrapper); if (ObjectUtil.isNotEmpty(warehousingStorageEntity)){ - //更新运管标志 - String inBound = yunguanPurchaseInBoundModel.getRECEIPT_NO(); - boolean inBoundNoExists = redisUtil.exists(inBound); - if (inBoundNoExists){ - QueryWrapper countQueryWrapper = new QueryWrapper<>(); - countQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); - long count = warehousingStorageProductService.count(countQueryWrapper); //入库单子表size - String s = redisUtil.getString(inBound).toString(); - List list = Arrays.asList(s.split(",")); - long lenght = list.size(); - if (lenght < count){ - list.add(yunguanPurchaseInBoundModel.getREAD_FLAG()); - redisUtil.insert(inBound,list); - }else if (lenght == count){ - boolean dis = list.stream().distinct().count() <= 1; - if (dis){ - warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); - warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); - warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); - warehousingStorageService.updateById(warehousingStorageEntity); - } - } - }else { - redisUtil.insert(inBound, yunguanPurchaseInBoundModel.getREAD_FLAG()); - } QueryWrapper warehousingStorageProductQueryWrapper = new QueryWrapper<>(); warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*","")); @@ -934,17 +1026,40 @@ public class YunguanInterfaceController { warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); warehousingStorageProductService.updateById(warehousingStorageProductEntity); - if (StringUtils.isEmpty(warehousingStorageEntity.getYunguanMark())){ - warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); - warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); - warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); - warehousingStorageService.updateById(warehousingStorageEntity); - } else if (warehousingStorageEntity.getYunguanMark().equals("Y")) { + if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){ warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); warehousingStorageService.updateById(warehousingStorageEntity); } + //更新运管标志 + String inBound = yunguanPurchaseInBoundModel.getRECEIPT_NO(); + boolean inBoundNoExists = redisUtil.exists(inBound); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); + countQueryWrapper.lambda().isNull(WarehousingStorageProductEntity::getDeleteMark); + long count = warehousingStorageProductService.count(countQueryWrapper); //入库单子表size + long size = redisUtil.getListSize(inBound); + List objList = redisUtil.get(inBound,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanPurchaseInBoundModel.getREAD_FLAG()); + redisUtil.remove(inBound); + redisUtil.insert(inBound,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); + warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); + warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); + warehousingStorageService.updateById(warehousingStorageEntity); + } + redisUtil.remove(inBound); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanPurchaseInBoundModel.getREAD_FLAG())); + redisUtil.insert(inBound, list); + } } } } @@ -964,17 +1079,40 @@ public class YunguanInterfaceController { warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); warehousingOutboundProductService.updateById(warehousingOutboundProductEntity); - if (StringUtils.isEmpty(warehousingOutboundEntity.getYunguanMark())){ - warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG()); - warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); - warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); - warehousingOutboundService.updateById(warehousingOutboundEntity); - }else if(warehousingOutboundEntity.getYunguanMark().equals("Y")){ + if (yunguanSaleOutBoundModel.getREAD_FLAG().equals("N")){ warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG()); warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); warehousingOutboundService.updateById(warehousingOutboundEntity); } + //更新运管标志 + String outBound = yunguanSaleOutBoundModel.getPROD_ZL(); + boolean inBoundNoExists = redisUtil.exists(outBound); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(WarehousingOutboundProductEntity::getWarehousingOutboundId,warehousingOutboundEntity.getId()); + countQueryWrapper.lambda().isNull(WarehousingOutboundProductEntity::getDeleteMark); + long count = warehousingOutboundProductService.count(countQueryWrapper); //入库单子表size + long size = redisUtil.getListSize(outBound); + List objList = redisUtil.get(outBound,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanSaleOutBoundModel.getREAD_FLAG()); + redisUtil.remove(outBound); + redisUtil.insert(outBound,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG()); + warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); + warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); + warehousingOutboundService.updateById(warehousingOutboundEntity); + } + redisUtil.remove(outBound); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanSaleOutBoundModel.getREAD_FLAG())); + redisUtil.insert(outBound, list); + } } } } @@ -984,12 +1122,41 @@ public class YunguanInterfaceController { QueryWrapper cwsettlementQueryWrapper = new QueryWrapper<>(); cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanPurchaseSettlementModel.getACCOUNT_NO()); CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper); - if (ObjectUtil.isNotEmpty(cwsettlementEntity)){ + if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanPurchaseSettlementModel.getREAD_FLAG().equals("N")){ cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG()); cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME()); cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE()); cwsettlementService.updateById(cwsettlementEntity); } + //更新运管标志 + String purSettlement = yunguanPurchaseSettlementModel.getACCOUNT_NO(); + boolean inBoundNoExists = redisUtil.exists(purSettlement); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId()); + countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark); + long count = cwsettlementsummaryService.count(countQueryWrapper); + count++; + long size = redisUtil.getListSize(purSettlement); + List objList = redisUtil.get(purSettlement,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanPurchaseSettlementModel.getREAD_FLAG()); + redisUtil.remove(purSettlement); + redisUtil.insert(purSettlement,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } + redisUtil.remove(purSettlement); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementModel.getREAD_FLAG())); + redisUtil.insert(purSettlement, list); + } } } else if (jsonObject.get("TYPE").equals("采购结算行")) { YunguanPurchaseSettlementProductModel yunguanPurchaseSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanPurchaseSettlementProductModel.class); @@ -1014,6 +1181,35 @@ public class YunguanInterfaceController { cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE()); cwsettlementService.updateById(cwsettlementEntity); } + //更新运管标志 + String purSettlement = yunguanPurchaseSettlementProductModel.getACCOUNT_NO(); + boolean inBoundNoExists = redisUtil.exists(purSettlement); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId()); + countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark); + long count = cwsettlementsummaryService.count(countQueryWrapper); + count++; + long size = redisUtil.getListSize(purSettlement); + List objList = redisUtil.get(purSettlement,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanPurchaseSettlementProductModel.getREAD_FLAG()); + redisUtil.remove(purSettlement); + redisUtil.insert(purSettlement,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } + redisUtil.remove(purSettlement); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanPurchaseSettlementProductModel.getREAD_FLAG())); + redisUtil.insert(purSettlement, list); + } } } } else if (jsonObject.get("TYPE").equals("销售结算头")) { @@ -1022,12 +1218,41 @@ public class YunguanInterfaceController { QueryWrapper cwsettlementQueryWrapper = new QueryWrapper<>(); cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementModel.getINVOICE_NO()); CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper); - if (ObjectUtil.isNotEmpty(cwsettlementEntity)){ + if (ObjectUtil.isNotEmpty(cwsettlementEntity) && yunguanSaleSettlementModel.getREAD_FLAG().equals("N")){ cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG()); cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME()); cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE()); cwsettlementService.updateById(cwsettlementEntity); } + //更新运管标志 + String salSettlement = yunguanSaleSettlementModel.getINVOICE_NO(); + boolean inBoundNoExists = redisUtil.exists(salSettlement); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId()); + countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark); + long count = cwsettlementsummaryService.count(countQueryWrapper); + count++; + long size = redisUtil.getListSize(salSettlement); + List objList = redisUtil.get(salSettlement,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanSaleSettlementModel.getREAD_FLAG()); + redisUtil.remove(salSettlement); + redisUtil.insert(salSettlement,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + cwsettlementEntity.setYunguanMark(yunguanSaleSettlementModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanSaleSettlementModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } + redisUtil.remove(salSettlement); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementModel.getREAD_FLAG())); + redisUtil.insert(salSettlement, list); + } } } else if (jsonObject.get("TYPE").equals("销售结算行")) { YunguanSaleSettlementProductModel yunguanSaleSettlementProductModel = JsonUtil.getJsonToBean(str, YunguanSaleSettlementProductModel.class); @@ -1055,6 +1280,35 @@ public class YunguanInterfaceController { cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); cwsettlementService.updateById(cwsettlementEntity); } + //更新运管标志 + String salSettlement = yunguanSaleSettlementProductModel.getINVOICE_NO(); + boolean inBoundNoExists = redisUtil.exists(salSettlement); + if (inBoundNoExists){ + QueryWrapper countQueryWrapper = new QueryWrapper<>(); + countQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId()); + countQueryWrapper.lambda().isNull(CwsettlementsummaryEntity::getDeleteMark); + long count = cwsettlementsummaryService.count(countQueryWrapper); + count++; + long size = redisUtil.getListSize(salSettlement); + List objList = redisUtil.get(salSettlement,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanSaleSettlementProductModel.getREAD_FLAG()); + redisUtil.remove(salSettlement); + redisUtil.insert(salSettlement,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + cwsettlementEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } + redisUtil.remove(salSettlement); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanSaleSettlementProductModel.getREAD_FLAG())); + redisUtil.insert(salSettlement, list); + } } } } @@ -1064,11 +1318,16 @@ public class YunguanInterfaceController { QueryWrapper workOrderQueryWrapper = new QueryWrapper<>(); workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO()); WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper); + QueryWrapper countPrimaryQueryWrapper = new QueryWrapper<>(); + countPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId()); + countPrimaryQueryWrapper.lambda().isNull(WorkOrderPrimaryEntity::getDeleteMark); + long countPrimary = workOrderPrimaryService.count(countPrimaryQueryWrapper); + QueryWrapper countProductQueryWrapper = new QueryWrapper<>(); + countProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId()); + countProductQueryWrapper.lambda().isNull(WorkOrderProductEntity::getDeleteMark); + long countProduct = workOrderProductService.count(countProductQueryWrapper); + long count = countPrimary+countProduct; if (ObjectUtil.isNotEmpty(workOrderEntity)){ -// QueryWrapper productQueryWrapper = new QueryWrapper<>(); -// productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD()); -// productQueryWrapper.lambda().isNull(ProductWarehouseEntity::getDeleteMark); -// ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper); if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("投入")){ QueryWrapper workOrderPrimaryQueryWrapper = new QueryWrapper<>(); workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getWorkId,workOrderEntity.getId()); @@ -1079,10 +1338,36 @@ public class YunguanInterfaceController { workOrderPrimaryEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); workOrderPrimaryEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); workOrderPrimaryService.updateById(workOrderPrimaryEntity); - workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); - workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); - workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); - workOrderService.updateById(workOrderEntity); + if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) { + workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); + workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); + workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); + workOrderService.updateById(workOrderEntity); + } + //更新运管标志 + String taskNo = yunguanProductProcessModel.getTASK_NO(); + boolean inBoundNoExists = redisUtil.exists(taskNo); + if (inBoundNoExists){ + long size = redisUtil.getListSize(taskNo); + List objList = redisUtil.get(taskNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanProductProcessModel.getREAD_FLAG()); + redisUtil.remove(taskNo); + redisUtil.insert(taskNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); + workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); + workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); + workOrderService.updateById(workOrderEntity); + } + redisUtil.remove(taskNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG())); + redisUtil.insert(taskNo, list); + } } } else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) { QueryWrapper workOrderProductQueryWrapper = new QueryWrapper<>(); @@ -1094,10 +1379,36 @@ public class YunguanInterfaceController { workOrderProductEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); workOrderProductEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); workOrderProductService.updateById(workOrderProductEntity); - workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); - workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); - workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); - workOrderService.updateById(workOrderEntity); + if (yunguanProductProcessModel.getREAD_FLAG().equals("N")) { + workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); + workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); + workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); + workOrderService.updateById(workOrderEntity); + } + //更新运管标志 + String taskNo = yunguanProductProcessModel.getTASK_NO(); + boolean inBoundNoExists = redisUtil.exists(taskNo); + if (inBoundNoExists){ + long size = redisUtil.getListSize(taskNo); + List objList = redisUtil.get(taskNo,0,size); + List list = objList.stream().map(Object::toString).collect(Collectors.toList()); + list.add(yunguanProductProcessModel.getREAD_FLAG()); + redisUtil.remove(taskNo); + redisUtil.insert(taskNo,list); + if (list.size() == count){ + boolean dis = list.stream().distinct().count() <= 1; + if (dis){ + workOrderEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); + workOrderEntity.setYunguanTime(yunguanProductProcessModel.getREAD_TIME()); + workOrderEntity.setYunguanMassage(yunguanProductProcessModel.getERR_MESSAGE()); + workOrderService.updateById(workOrderEntity); + } + redisUtil.remove(taskNo); + } + }else { + List list = new ArrayList<>(Collections.singleton(yunguanProductProcessModel.getREAD_FLAG())); + redisUtil.insert(taskNo, list); + } } } } diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue index 935af137..750213ad 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/index.vue @@ -178,7 +178,10 @@ - + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue index 7ef3ba2f..f302e8c3 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/purchaseOrder/index.vue @@ -219,6 +219,10 @@ 等待提交 + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue index fc8f3b73..82772375 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/saleOrder/index.vue @@ -169,6 +169,10 @@ 等待提交 + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue index 3787eda7..ce0ecc12 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingoutbound/index.vue @@ -127,6 +127,10 @@ 等待提交 + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue index 4dbab5af..bb4ae5dd 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/warehousing/warehousingstorage/index.vue @@ -133,6 +133,10 @@ 等待提交 + + + + diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue index d482efb3..0e6ee4f5 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/workorder/index.vue @@ -130,6 +130,10 @@ 等待提交 + + + +