From 0ae631b2e473dfe70643fc17e11b8a1f0a575b69 Mon Sep 17 00:00:00 2001 From: vayne Date: Wed, 31 Jul 2024 17:26:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BE=E5=BC=80=E6=8E=A5=E5=8F=A3=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 1 + .../src/main/resources/application-pro.yml | 1 + .../src/main/resources/application-test.yml | 1 + .../service/impl/CwsettlementServiceImpl.java | 11 +- .../impl/WarehousingOutboundServiceImpl.java | 31 +++--- .../impl/WarehousingStorageServiceImpl.java | 31 +++--- .../controller/BusinessOrderController.java | 102 +++++++++--------- .../controller/CwsettlementController.java | 52 ++++----- .../jnpf/controller/WorkOrderController.java | 28 ++--- .../src/views/extend/cwaccount/form.vue | 42 ++++---- .../src/views/extend/cwsettlement/form.vue | 54 ++++++++++ .../src/views/extend/cwsettlement/index.vue | 15 +-- .../purchaseCenter/purchaseOrder/index.vue | 20 ++-- .../scm/purchaseCenter/receiptOrder/form.vue | 18 ++-- .../scm/saleCenter/deliveryOrder/form.vue | 18 ++-- .../views/scm/saleCenter/saleOrder/index.vue | 20 ++-- .../warehousing/warehousingoutbound/index.vue | 4 +- .../warehousing/warehousingstorage/index.vue | 4 +- .../src/views/scm/workorder/index.vue | 28 +---- 19 files changed, 261 insertions(+), 220 deletions(-) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml index 9b53bd68..d780aa8b 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-dev.yml @@ -113,6 +113,7 @@ springdoc: # password: 123456 config: + yunguaninterfaceurl: http://172.16.1.50:8020 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml index 63aea373..c27baf18 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-pro.yml @@ -113,6 +113,7 @@ springdoc: # password: 123456 config: + yunguaninterfaceurl: http://172.16.8.54:8020 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 ApiDomain: http://127.0.0.1:40000 #后端域名(文档预览中使用) FrontDomain: http://127.0.0.1:9000 #前端域名(文档预览中使用) diff --git a/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml b/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml index d51fcc0c..741e6296 100644 --- a/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml +++ b/jnpf-java-boot/jnpf-admin/src/main/resources/application-test.yml @@ -116,6 +116,7 @@ springdoc: # password: 123456 config: + yunguaninterfaceurl: http://172.16.1.50:8020 kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java index 1992477e..9e8c7c28 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/CwsettlementServiceImpl.java @@ -32,6 +32,7 @@ import java.util.stream.Collectors; import jnpf.base.model.ColumnDataModel; import jnpf.util.wxutil.HttpUtil; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.database.model.superQuery.SuperJsonModel; @@ -111,6 +112,8 @@ public class CwsettlementServiceImpl extends ServiceImpl getList(CwsettlementPagination cwsettlementPagination){ @@ -1319,7 +1322,7 @@ public class CwsettlementServiceImpl extends ServiceImpl getList(WarehousingOutboundPagination warehousingOutboundPagination){ return getTypeList(warehousingOutboundPagination,warehousingOutboundPagination.getDataType()); @@ -1011,20 +1014,20 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId()); -// if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { -// JSONObject saleCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); -// if (ObjectUtil.isNotEmpty(saleCode)){ -// entity.setErpMark(saleCode.get("code").toString()); -// entity.setErpMassage(saleCode.get("errmsg").toString()); -// }else { -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// this.saveOrUpdate(entity); -// } -// } + if (entity.getWarehousingOutboundType().equals("12")){ + List yunguanSaleOutBoundModelList = warehousingOutboundMapper.saleOutBoundByYunGuan(entity.getId()); + if (yunguanSaleOutBoundModelList != null && yunguanSaleOutBoundModelList.size()>0) { + JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/sal/stoOurRecs", "POST", JsonUtil.getObjectToString(yunguanSaleOutBoundModelList)); + if (ObjectUtil.isNotEmpty(saleCode)){ + entity.setErpMark(saleCode.get("code").toString()); + entity.setErpMassage(saleCode.get("errmsg").toString()); + }else { + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + this.saveOrUpdate(entity); + } + } } @Override diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java index f3f5ea94..984d9763 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingStorageServiceImpl.java @@ -31,6 +31,7 @@ import jnpf.util.wxutil.HttpUtil; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.database.model.superQuery.SuperJsonModel; @@ -99,6 +100,8 @@ public class WarehousingStorageServiceImpl extends ServiceImpl getList(WarehousingStoragePagination warehousingStoragePagination){ return getTypeList(warehousingStoragePagination,warehousingStoragePagination.getDataType()); @@ -1035,20 +1038,20 @@ public class WarehousingStorageServiceImpl extends ServiceImpl yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId()); -// if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) { -// JSONObject purchaseCode = HttpUtil.httpRequest("http://172.16.1.50:8020/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList)); -// if (ObjectUtil.isNotEmpty(purchaseCode)){ -// entity.setErpMark(purchaseCode.get("code").toString()); -// entity.setErpMassage(purchaseCode.get("errmsg").toString()); -// }else{ -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// this.saveOrUpdate(entity); -// } -// } + if (entity.getWarehousingStorageType().equals("15")){ + List yunguanPurchaseInBoundModelList = warehousingStorageMapper.purchaseInBoundByYunGuan(entity.getId()); + if (yunguanPurchaseInBoundModelList != null && yunguanPurchaseInBoundModelList.size()>0) { + JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/pur/stoIn", "POST", JsonUtil.getObjectToString(yunguanPurchaseInBoundModelList)); + if (ObjectUtil.isNotEmpty(purchaseCode)){ + entity.setErpMark(purchaseCode.get("code").toString()); + entity.setErpMassage(purchaseCode.get("errmsg").toString()); + }else{ + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + this.saveOrUpdate(entity); + } + } } 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 a22e7904..d55e2fe0 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 @@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.*; @@ -130,7 +131,8 @@ public class BusinessOrderController { private CwsettlementController cwsettlementController; @Autowired private CwsettlementService cwsettlementService; - + @Value("${config.yunguaninterfaceurl}") + private String yunguaninterfaceurl; /** * 列表 * @@ -635,55 +637,55 @@ 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)); -// if(ObjectUtil.isNotEmpty(purchaseCode)){ -// entity.setErpMark(purchaseProductCode.get("code").toString()); -// entity.setErpMassage(purchaseProductCode.get("errmsg").toString()); -// }else{ -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// }else { -// entity.setErpMark(purchaseCode.get("code").toString()); -// entity.setErpMassage(purchaseCode.get("errmsg").toString()); -// } -// }else { -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// } -// }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 (ObjectUtil.isNotEmpty(saleProductCode)){ -// entity.setErpMark(saleCode.get("code").toString()); -// entity.setErpMassage(saleCode.get("errmsg").toString()); -// }else{ -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// }else{ -// entity.setErpMark(saleCode.get("code").toString()); -// entity.setErpMassage(saleCode.get("errmsg").toString()); -// } -// }else { -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } -// } -// } + if (entity.getBusinessType().equals("1")) { + YunguanPurchaseOrderModel purchaseOrder = businessOrderService.queryPurchaseOrderByYunGuanInfo(id); + if (ObjectUtil.isNotEmpty(purchaseOrder)) { + JSONObject purchaseCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/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(yunguaninterfaceurl+"/fggj/pur/ordLine", "POST", JsonUtil.getObjectToString(purchaseOrderProduct)); + if(ObjectUtil.isNotEmpty(purchaseCode)){ + entity.setErpMark(purchaseProductCode.get("code").toString()); + entity.setErpMassage(purchaseProductCode.get("errmsg").toString()); + }else{ + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + }else { + entity.setErpMark(purchaseCode.get("code").toString()); + entity.setErpMassage(purchaseCode.get("errmsg").toString()); + } + }else { + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + } + }else if (entity.getBusinessType().equals("2")){ + YunguanSaleOrderModel saleOrder = businessOrderService.querySaleOrderByYunGuanInfo(id); + if (ObjectUtil.isNotEmpty(saleOrder)){ + JSONObject saleCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/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(yunguaninterfaceurl+"/fggj/sal/ordLine", "POST", JsonUtil.getObjectToString(saleOrderProduct)); + if (ObjectUtil.isNotEmpty(saleProductCode)){ + entity.setErpMark(saleCode.get("code").toString()); + entity.setErpMassage(saleCode.get("errmsg").toString()); + }else{ + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + }else{ + entity.setErpMark(saleCode.get("code").toString()); + entity.setErpMassage(saleCode.get("errmsg").toString()); + } + }else { + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + } + } businessOrderService.saveOrUpdate(entity); } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java index f90af80d..1eb5aab5 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/CwsettlementController.java @@ -648,32 +648,32 @@ public class CwsettlementController { } cwsettlementForm.setCreatorUserId(entity.getCreatorUserId()); cwsettlementService.saveOrUpdate(cwsettlementForm,id,false); -// FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); -// if (flowTaskEntity!=null){ -// QueryWrapper flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); -// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); -// flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); -// List flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); -// if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { -// ActionResult entity1 = this.info(id); -// Map map = (Map) entity1.getData(); -// CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions()); -// //推送结算单到运管 -// if(ObjectUtil.equals(entity.getType(), "2")){ -// //销售 -// boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity); -// if(headFlag){ -// boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity); -// } -// }else{ -// //采购 -// boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity); -// if(headFlag){ -// boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity); -// } -// } -// } -// } + FlowTaskEntity flowTaskEntity = flowTaskService.getById(id); + if (flowTaskEntity!=null){ + QueryWrapper flowTaskNodeEntityQueryWrapper = new QueryWrapper<>(); + flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getNodeCode, flowTaskEntity.getThisStepId()); + flowTaskNodeEntityQueryWrapper.lambda().eq(FlowTaskNodeEntity::getTaskId, flowTaskEntity.getId()); + List flowTaskNodeEntityList = flowTaskNodeService.list(flowTaskNodeEntityQueryWrapper); + if(flowTaskNodeEntityList != null && flowTaskNodeEntityList.size()>0 && "end".equals(flowTaskNodeEntityList.get(0).getNodeNext())) { + ActionResult entity1 = this.info(id); + Map map = (Map) entity1.getData(); + CwsettlementEntity cwsettlementEntity = BeanUtil.mapToBean(map, CwsettlementEntity.class, new CopyOptions()); + //推送结算单到运管 + if(ObjectUtil.equals(entity.getType(), "2")){ + //销售 + boolean headFlag = cwsettlementService.pushSaleHeadYunguan(cwsettlementEntity); + if(headFlag){ + boolean lineFlag = cwsettlementService.pushSaleLineYunguan(cwsettlementEntity); + } + }else{ + //采购 + boolean headFlag = cwsettlementService.pushPurchaseHeadYunguan(cwsettlementEntity); + if(headFlag){ + boolean lineFlag = cwsettlementService.pushPurchaseLineYunguan(cwsettlementEntity); + } + } + } + } }catch(Exception e){ return ActionResult.fail("修改数据失败"); } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java index 614735ad..3bc71ca1 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/WorkOrderController.java @@ -38,8 +38,8 @@ import lombok.extern.slf4j.Slf4j; import org.checkerframework.checker.units.qual.A; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; -import javax.validation.Valid; import java.math.BigDecimal; import java.util.*; import jnpf.annotation.JnpfField; @@ -74,6 +74,8 @@ import jnpf.base.model.ColumnDataModel; import jnpf.base.util.VisualUtils; import org.springframework.transaction.annotation.Transactional; +import javax.validation.Valid; + /** * workOrder * @版本： V3.5 @@ -140,6 +142,8 @@ public class WorkOrderController { private WarehousingReturnService warehousingReturnService; @Autowired private WarehousingReportlossService warehousingReportlossService; + @Value("${config.yunguaninterfaceurl}") + private String yunguaninterfaceurl; /** * 列表 * @@ -796,17 +800,17 @@ public class WorkOrderController { warehousingOutboundController.createWork(id,warehousingOutboundForm); } } -// List yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id); -// List 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)){ -// entity.setErpMark(workOrderCode.get("code").toString()); -// entity.setErpMassage(workOrderCode.get("errmsg").toString()); -// }else { -// entity.setErpMark("N"); -// entity.setErpMassage("ESB返回为空"); -// } + List yunguanProductProcessModelList = workOrderService.queryWorkOrderProductByYunguan(id); + List yunguanProductProcessModelList1 = workOrderService.queryWorkOrderPrimaryByYunguan(id); + yunguanProductProcessModelList.addAll(yunguanProductProcessModelList1); + JSONObject workOrderCode = HttpUtil.httpRequest(yunguaninterfaceurl+"/fggj/prod/proditem", "POST", JsonUtil.getObjectToString(yunguanProductProcessModelList)); + if(ObjectUtil.isNotEmpty(workOrderCode)){ + entity.setErpMark(workOrderCode.get("code").toString()); + entity.setErpMassage(workOrderCode.get("errmsg").toString()); + }else { + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } workOrderService.updateById(entity); } } diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue index 01664c42..1dee1e54 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwaccount/form.vue @@ -1896,33 +1896,33 @@ export default { return sums; }, - initList(list) { - for (let i = 0; i < list.length; i++) { - const e = list[i]; - this.dataForm.cwaccountstorageList.push(e) - } - //this.addcwaccountvoucherList(); - }, // initList(list) { - // let mark = false // for (let i = 0; i < list.length; i++) { // const e = list[i]; - // if (e.yunguanMark == 'Y') { - // this.dataForm.cwaccountstorageList.push(e) - // } else { - // mark = true - // } - // } - // if (mark) { - // this.$message({ - // message: '运管暂未返回正常订单状态', - // type: 'error', - // duration: 1000 - // }); - // return + // this.dataForm.cwaccountstorageList.push(e) // } // //this.addcwaccountvoucherList(); // }, + initList(list) { + let mark = false + for (let i = 0; i < list.length; i++) { + const e = list[i]; + if (e.yunguanMark == 'Y') { + this.dataForm.cwaccountstorageList.push(e) + } else { + mark = true + } + } + if (mark) { + this.$message({ + message: '存在运管暂未返回正常订单状态的订单', + type: 'error', + duration: 1000 + }); + return + } + //this.addcwaccountvoucherList(); + }, typeChangeData() { this.dataForm.cwaccountsubjectList = []; this.dataForm.cwaccountcontractList = []; diff --git a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue index 2a26eb76..b224f319 100644 --- a/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/extend/cwsettlement/form.vue @@ -2054,6 +2054,51 @@ export default { }, tableRequiredData: {}, dataRule: { + custTy: [{ + required: true, + message: '请选择事务处理类型', + trigger: 'blur' + },], + invoiceDate: [{ + required: true, + message: '请选择发票日期', + trigger: 'change' + },], + invoiceCnt: [{ + required: true, + message: '请输入发票张数', + trigger: 'blur' + },], + invoiceType: [{ + required: true, + message: '请选择发票类型', + trigger: 'change' + },], + attribute11: [{ + required: true, + message: '请输入发票号码', + trigger: 'blur' + },], + invoiceAmount: [{ + required: true, + message: '请输入发票金额', + trigger: 'blur' + },], + glDate: [{ + required: true, + message: '请选择入账时间', + trigger: 'change' + },], + description: [{ + required: true, + message: '请输入摘要', + trigger: 'blur' + },], + annexCnt: [{ + required: true, + message: '请输入附件张数', + trigger: 'blur' + },], type: [{ required: true, message: '请至少选择一个', @@ -2991,6 +3036,15 @@ export default { let isOk = true; for (let i = 0; i < this.dataForm.cwsettlementsummaryList.length; i++) { const e = this.dataForm.cwsettlementsummaryList[i]; + if (!e.itemNmInv) { + this.$message({ + message: '开票商品名称不能为空', + type: 'error', + duration: 1000 + }); + isOk = false + break + } } return isOk; }, 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 71406b15..a5e19b61 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 @@ -43,8 +43,8 @@ - + @@ -150,12 +150,6 @@ - - - - - - + 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 2dabb65b..525eab73 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 @@ -266,9 +266,9 @@ @click="handleDelVoucher(scope.row.id)">删除 - + @@ -527,14 +527,14 @@ export default { }) }, inBoundNotice(row) { - // if (row.yunguanMark != 'Y') { - // this.$message({ - // type: 'error', - // message: '运管暂未返回正常订单状态', - // duration: 1500, - // }) - // return - // } + if (row.yunguanMark != 'Y') { + this.$message({ + type: 'error', + message: '运管暂未返回正常订单状态', + duration: 1500, + }) + return + } const selectData = row selectData.flag = '采购入库通知' if (!this.inBoundFlowList.length) { diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue index 91110918..f5537d9a 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/purchaseCenter/receiptOrder/form.vue @@ -1789,15 +1789,15 @@ export default { ); }, getPurchaseOrder(val, val2) { - // if (val2.yunguanMark != 'Y') { - // this.dataForm.businessId = undefined - // this.$message({ - // message: '运管暂未返回正常订单状态', - // type: 'error', - // duration: 1000 - // }); - // return - // } + if (val2.yunguanMark != 'Y') { + this.dataForm.businessId = undefined + this.$message({ + message: '运管暂未返回正常订单状态', + type: 'error', + duration: 1000 + }); + return + } this.dataForm.purchaseOrderInfo = []; this.dataForm.purchaseOrderInfo[0] = val2; this.dataForm.subjectId = val2.firstSubjectBasicId; diff --git a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue index 6af53e34..c76b6c16 100644 --- a/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue +++ b/jnpf-java-boot/jnpf-web/src/views/scm/saleCenter/deliveryOrder/form.vue @@ -1732,15 +1732,15 @@ export default { ); }, getSaleOrder(val, val2) { - // if (val2.yunguanMark != 'Y') { - // this.dataForm.businessId = undefined - // this.$message({ - // message: '运管暂未返回正常订单状态', - // type: 'error', - // duration: 1000 - // }); - // return - // } + if (val2.yunguanMark != 'Y') { + this.dataForm.businessId = undefined + this.$message({ + message: '运管暂未返回正常订单状态', + type: 'error', + duration: 1000 + }); + return + } this.dataForm.businessOrderInfoList = []; this.dataForm.businessOrderInfoList[0] = val2; this.dataForm.subjectId = val2.firstSubjectBasicId; 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 b394066d..5bf3a211 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 @@ -229,9 +229,9 @@ @click="handleDelVoucher(scope.row.id)">删除 - + @@ -454,14 +454,14 @@ export default { }) }, outBoundNotice(row) { - // if (row.yunguanMark != 'Y') { - // this.$message({ - // type: 'error', - // message: '运管暂未返回正常订单状态', - // duration: 1500, - // }) - // return - // } + if (row.yunguanMark != 'Y') { + this.$message({ + type: 'error', + message: '运管暂未返回正常订单状态', + duration: 1500, + }) + return + } const selectData = row selectData.flag = '销售出库通知' if (!this.outBoundFlowList.length) { 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 d929cac2..0c63ac8f 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 @@ -151,9 +151,9 @@ 详情 - + 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 c16ffb2f..3f746471 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 @@ -157,9 +157,9 @@ 详情 - + 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 22dcf5c1..7e848a12 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 @@ -167,9 +167,9 @@ 详情 - + @@ -590,14 +590,6 @@ export default { }, addOstarts(row, status) { - // if (row.erpMark != '200') { - // this.$message({ - // type: 'error', - // message: '运管暂未返回正常订单状态', - // duration: 1500, - // }) - // return - // } let id = row.id this.$confirm("此操作将进行加工, 是否继续?", "提示", { type: "warning", @@ -652,14 +644,6 @@ export default { }, addOstartsRescind(row, status) { - // if (row.erpMark != '200') { - // this.$message({ - // type: 'error', - // message: '运管暂未返回正常订单状态', - // duration: 1500, - // }) - // return - // } let id = row.id this.$confirm("此操作将进行取消加工, 是否继续?", "提示", { type: "warning", @@ -703,14 +687,6 @@ export default { }, addOrUpdateHandleOver(row, isDetail) { - // if (row.erpMark != '200') { - // this.$message({ - // type: 'error', - // message: '运管暂未返回正常订单状态', - // duration: 1500, - // }) - // return - // } let id = row ? row.id : "" this.formVisibleOver = true this.$nextTick(() => {