From eb928cb4e45eb41a30e28dddfdeb58134cd16226 Mon Sep 17 00:00:00 2001 From: Vayne02 <123@163.com> Date: Mon, 22 Jul 2024 11:02:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-test.yml | 4 +- .../mapper/scm/BusinessOrderMapper.xml | 16 +-- .../mapper/scm/WarehousingOutboundMapper.xml | 7 +- .../mapper/scm/WarehousingStorageMapper.xml | 2 +- .../resources/mapper/scm/WorkOrderMapper.xml | 33 +++-- .../service/impl/CwsettlementServiceImpl.java | 18 ++- .../impl/WarehousingOutboundServiceImpl.java | 23 +-- .../impl/WarehousingStorageServiceImpl.java | 28 ++-- .../controller/BusinessOrderController.java | 76 ++++++---- .../controller/CwsettlementController.java | 52 +++---- .../jnpf/controller/WorkOrderController.java | 12 +- .../YunguanInterfaceController.java | 131 +++++++++++++----- .../yunguan/YunguanProductProcessModel.java | 3 + .../YunguanPurchaseSettlementModel.java | 6 +- .../yunguan/YunguanSaleOutBoundModel.java | 3 + 15 files changed, 270 insertions(+), 144 deletions(-) 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 7624e376..dd6a772d 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 @@ -2,7 +2,7 @@ server: tomcat: uri-encoding: UTF-8 #tomcat编码 - port: 50000 #tomcat端口 + port: 30000 #tomcat端口 spring: devtools: #spring开发者工具模块 @@ -114,7 +114,7 @@ springdoc: config: kkFileUrl: http://127.0.0.1:30090/FileServer/ #kkfile文件预览服务地址 - ApiDomain: http://127.0.0.1:50000 #后端域名(文档预览中使用) + ApiDomain: http://127.0.0.1:30000 #后端域名(文档预览中使用) FrontDomain: http://127.0.0.1:3000 #前端域名(文档预览中使用) AppDomain: http://127.0.0.1:8080 #app/h5端域名配置(文档预览中使用) # ===================== 是否开启测试环境 ===================== 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 41c067e3..765b2b3e 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 @@ -897,9 +897,9 @@ a.expect_arrive_date_start AS DELV_DT, b.CODE AS SUPPLIER_CD, b.NAME AS SUPPLIER_NM, - b.reserved_fields4 AS SUPPLIER_SITE_ID, - b.reserved_fields5 AS RESERVE2, - 'CYN' AS CURRENCY_CD, + b.reserved_fields5 AS SUPPLIER_SITE_ID, + b.reserved_fields4 AS RESERVE2, + 'CNY' AS CURRENCY_CD, CASE a.transaction_mode WHEN '1' THEN @@ -961,7 +961,7 @@ '' as CHECK_EMP_ID, null as CHECK_DTM, 'B' as ORD_STATUS, - a.f_creator_user_id as CREATE_EMP_ID, + e.f_real_name as CREATE_EMP_ID, a.f_creator_time as CREATE_DTM, 'N' as READ_FLAG, null as READ_TIME, @@ -997,20 +997,20 @@ b.id AS ID, c.f_en_code AS COMP_CD, a.CODE AS ORD_NO, - LPAD(b.ord_ln,2,0) as ORD_LN, + LPAD(b.ord_ln,3,0) as ORD_LN, d.CODE AS ITEM_CD, d.NAME AS ITEM_NM, - d.spec AS SPEC_TYPE, + b.spec AS SPEC_TYPE, b.business_num AS QUANTITY, b.sales_main_unit_id AS UNIT, f.price_rate AS CONTR_PRICE, b.not_tax_price AS PRICE, b.business_price AS TAX_PRICE, b.tax AS TAX_RATE, - f.tax_rate_code AS TAX_RATE_CD, + concat('VAT_IN_',b.tax) AS TAX_RATE_CD, b.not_tax_count AS AMOUNT, b.tax_count AS TOTAL_AMOUNT, - 'CYN' AS CURRENCY_CD, + 'CNY' AS CURRENCY_CD, a.expect_arrive_date_start AS DELV_DT, f.delv_tol_max as DELV_TOL_MAX, f.delv_tol_min as DELV_TOL_MIN, 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 42cdfa8a..1df49100 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 @@ -138,7 +138,7 @@ aa.spec AS SPECIFICATION, aa.outbound_unit AS UNIT, aa.outbound_number AS OUT_QUANTITY, - '1' as OUT_FLAG, + '2' as OUT_FLAG, s.contract_no as contract_no, g.f_real_name as CREATE_EMP_ID, a.f_creator_time as CREATE_DTM, @@ -153,10 +153,13 @@ null as ESB_DTM, '' as ESB_MESSAGE, IF(a.warehousing_outbound_type = 1,LPAD(n.ord_ln,3,0),LPAD(o.ord_ln,3,0)) as SAL_LINE, - aa.batch_number as BATCH_ID + aa.batch_number as BATCH_ID, + concat(ac.business_order_no,'-',LPAD(ab.ord_ln,3,0)) as PUR_ORDER FROM jg_warehousing_outbound a RIGHT JOIN jg_warehousing_outbound_product aa ON a.id = aa.warehousing_outbound_id AND aa.f_delete_mark is null + LEFT JOIN jg_warehousing_storage_product ab ON aa.batch_number = ab.batch_number AND ab.f_delete_mark is null + LEFT JOIN jg_warehousing_storage ac ON ab.warehousing_storage_id = ac.id AND ac.f_delete_mark is null LEFT JOIN jg_warehousing_notification b ON a.warehousing_id = b.id AND b.f_delete_mark IS NULL LEFT JOIN jg_business_order c ON b.business_id = c.id AND c.f_delete_mark IS NULL LEFT JOIN jg_subject_basic d ON c.first_subject_basic_id = d.id AND d.f_delete_mark IS NULL 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 9b471d7f..5e749e26 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 @@ -370,7 +370,7 @@ a.document_no AS RECEIPT_NO, a.warehousing_time AS RECEIPT_DTM, IF(a.warehousing_storage_type = '1',c.code,l.code) as ORD_NO, - aa.ord_ln as ORD_LN, + LPAD(aa.ord_ln,3,0) as ORD_LN, IF(a.warehousing_storage_type = '1',h.contract_number,q.contract_number) AS CON_CD, IF(a.warehousing_storage_type = '1',h.contract_no,q.contract_no) AS CON_NO, IF(a.warehousing_storage_type = '1',d.code,p.code) AS SUPPLIER_CD, 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 03ff303d..d715edf6 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 @@ -168,8 +168,8 @@ 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 41549455..19c002f0 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 @@ -27,6 +27,7 @@ import jnpf.model.QueryModel; import java.util.stream.Collectors; import jnpf.base.model.ColumnDataModel; import jnpf.util.wxutil.HttpUtil; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.core.metadata.IPage; import jnpf.database.model.superQuery.SuperJsonModel; @@ -1063,7 +1064,7 @@ public class CwsettlementServiceImpl 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)){ -// if (saleCode.get("code").equals("200")) { -// } -// } -// } -// } + if (entity.getWarehousingOutboundType().equals("12")){ + List 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返回为空"); + } + } + } } @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 a8fca63d..c4e31ab4 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 @@ -963,16 +963,22 @@ 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)){ -// if (purchaseCode.get("code").equals("200")) { -// } -// } -// } -// } + if (entity.getWarehousingStorageType().equals("15")){ + List 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)){ + if (purchaseCode.get("code").equals("200")) { + entity.setErpMark(purchaseCode.get("code").toString()); + entity.setErpMassage(purchaseCode.get("errmsg").toString()); + } + }else{ + entity.setErpMark("N"); + entity.setErpMassage("ESB返回为空"); + } + } + } + this.saveOrUpdate(entity); } @@ -1169,7 +1175,7 @@ public class WarehousingStorageServiceImpl extends ServiceImpl userIPage; if(StringUtil.equals(warehousingStoragePagination.getType(), "1")){ 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 36acc93a..f464a471 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 @@ -635,33 +635,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)){ -// System.out.println(purchaseCode.toString()); -// } -// } -// } -// } -// }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)); -// System.out.println(saleProductCode); -// } -// } -// } -// } + 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返回为空"); + } + } + } 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 64e1719d..382c0c19 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 @@ -796,12 +796,12 @@ 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) && workOrderCode.get("code").equals("200")){ -// } + 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) && workOrderCode.get("code").equals("200")){ + } } } 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 a2c469cd..555ad0da 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 @@ -20,6 +20,8 @@ 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.boot.autoconfigure.cache.CacheProperties; +import org.springframework.boot.autoconfigure.data.redis.RedisProperties; import org.springframework.web.bind.annotation.*; import javax.servlet.ServletInputStream; @@ -124,10 +126,16 @@ public class YunguanInterfaceController { queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString()); List orgList = organizeService.list(queryWrapper); if(orgList != null && orgList.size() > 0){ - List conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); + List conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(",")); String organizeId = JSON.toJSONString(conpanyIdList); entity.setOrganizeJsonId(organizeId);//分支机构编码 } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR1")) ? null : jsonObject.get("ATTR1").toString()); + List companyId = organizeService.list(queryWrapper); + if (companyId != null && companyId.size() > 0) { + entity.setCompanyId(companyId.get(0).getId());//公司id + } entity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型 entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型 entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家 @@ -153,6 +161,7 @@ public class YunguanInterfaceController { }else { //新增客户 SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity(); + subjectbasicEntity.setCollaborationMethod("1"); subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("CUST_FULL_NAME")) ? null : jsonObject.get("CUST_FULL_NAME").toString());//名称 subjectbasicEntity.setCalssify("1");//一级 @@ -171,10 +180,16 @@ public class YunguanInterfaceController { queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR3")) ? null : jsonObject.get("ATTR3").toString()); List orgList = organizeService.list(queryWrapper); if (orgList != null && orgList.size() > 0) { - List conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); + List conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(",")); String organizeId = JSON.toJSONString(conpanyIdList); subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码 } + QueryWrapper queryWrapper1 = new QueryWrapper<>(); + queryWrapper1.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ATTR1")) ? null : jsonObject.get("ATTR1").toString()); + List companyId = organizeService.list(queryWrapper); + if (companyId != null && companyId.size() > 0) { + subjectbasicEntity.setCompanyId(companyId.get(0).getId());//公司id + } subjectbasicEntity.setReservedFields1(ObjectUtil.isEmpty(jsonObject.get("ACCOUNT_TYPE")) ? null : jsonObject.get("ACCOUNT_TYPE").toString());//账户类型 subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("CLIENT_CLASSIFY")) ? null : jsonObject.get("CLIENT_CLASSIFY").toString());//客户类型 if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){ @@ -243,9 +258,10 @@ public class YunguanInterfaceController { queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString()); List orgList = organizeService.list(queryWrapper); if(orgList != null && orgList.size() > 0){ - List conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); + List conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(",")); String organizeId = JSON.toJSONString(conpanyIdList); entity.setOrganizeJsonId(organizeId);//分支机构编码 + entity.setCompanyId(orgList.get(0).getId());//公司id } entity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString()); entity.setCountry(ObjectUtil.isEmpty(jsonObject.get("COUNTRY")) ? null : jsonObject.get("COUNTRY").toString());//国家 @@ -269,6 +285,7 @@ public class YunguanInterfaceController { }else { //新增供应商 SubjectbasicEntity subjectbasicEntity = new SubjectbasicEntity(); + subjectbasicEntity.setCollaborationMethod("1"); subjectbasicEntity.setId(ObjectUtil.isEmpty(jsonObject.get("ID")) ? null : jsonObject.get("ID").toString());//ID subjectbasicEntity.setName(ObjectUtil.isEmpty(jsonObject.get("VENDOR_NAME")) ? null : jsonObject.get("VENDOR_NAME").toString());//名称 subjectbasicEntity.setCalssify("1");//一级 @@ -287,9 +304,10 @@ public class YunguanInterfaceController { queryWrapper.lambda().eq(OrganizeEntity::getEnCode, ObjectUtil.isEmpty(jsonObject.get("ORG_ID")) ? null : jsonObject.get("ORG_ID").toString()); List orgList = organizeService.list(queryWrapper); if (orgList != null && orgList.size() > 0) { - List conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); + List conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(",")); String organizeId = JSON.toJSONString(conpanyIdList); subjectbasicEntity.setOrganizeJsonId(organizeId);//分支机构编码 + entity.setCompanyId(orgList.get(0).getId());//公司id } subjectbasicEntity.setReservedFields2(ObjectUtil.isEmpty(jsonObject.get("VENDOR_TYPE")) ? null : jsonObject.get("VENDOR_TYPE").toString());//供应商类型 if (ObjectUtil.isNotEmpty(jsonObject.get("COUNTRY"))){ @@ -348,10 +366,13 @@ public class YunguanInterfaceController { //库存组织编码,库存组织名称 if(ObjectUtil.isNotEmpty(jsonObject.get("ORG_CD"))){ contractLEntity.setKucunOrgCode(jsonObject.get("ORG_CD").toString()); - DictionaryyunguandataEntity dictionaryyunguandataEntity = dictionaryyunguandataService.getDateValueInfo("564773000885326917",contractLEntity.getKucunOrgCode()); - if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity)) { - contractLEntity.setKucunOrgName(dictionaryyunguandataEntity.getZhihuiValue()); - } +// DictionaryyunguandataEntity dictionaryyunguandataEntity = dictionaryyunguandataService.getDateValueInfo("564773000885326917",contractLEntity.getKucunOrgCode()); +// if (ObjectUtil.isNotEmpty(dictionaryyunguandataEntity)) { +// contractLEntity.setKucunOrgName(dictionaryyunguandataEntity.getZhihuiValue()); +// } + } + if (ObjectUtil.isNotEmpty(jsonObject.get("ORG_NM"))){ + contractLEntity.setKucunOrgName(jsonObject.get("ORG_NM").toString()); } //组织，公司，部门，签约主体 if(ObjectUtil.isNotEmpty(jsonObject.get("DEPT_CD"))){ @@ -359,7 +380,7 @@ public class YunguanInterfaceController { queryWrapper.lambda().eq(OrganizeEntity::getEnCode, jsonObject.get("DEPT_CD").toString()); List orgList = organizeService.list(queryWrapper); if(orgList != null && orgList.size() > 0){ - List conpanyIdList = Arrays.asList(orgList.get(0).getCompanyIdTree().split(",")); + List conpanyIdList = Arrays.asList(orgList.get(0).getOrganizeIdTree().split(",")); String organizeId = JSON.toJSONString(conpanyIdList); contractLEntity.setDepartmentId(orgList.get(0).getId()); contractLEntity.setCompanyId(orgList.get(0).getParentId()); @@ -826,6 +847,12 @@ public class YunguanInterfaceController { businessOrderProductRelationalEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE()); businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity); } + if (yunguanPurchaseOrderProductModel.getREAD_FLAG().equals("N")){ + businessOrderEntity.setYunguanMark(yunguanPurchaseOrderProductModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanPurchaseOrderProductModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanPurchaseOrderProductModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } } } } else if (jsonObject.get("TYPE").equals("销售订单头")) { @@ -858,6 +885,12 @@ public class YunguanInterfaceController { businessOrderProductRelationalEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE()); businessOrderProductRelationalService.updateById(businessOrderProductRelationalEntity); } + if (yunguanSaleOrderProductModel.getREAD_FLAG().equals("N")){ + businessOrderEntity.setYunguanMark(yunguanSaleOrderProductModel.getREAD_FLAG()); + businessOrderEntity.setYunguanTime(yunguanSaleOrderProductModel.getREAD_TIME()); + businessOrderEntity.setYunguanMassage(yunguanSaleOrderProductModel.getERR_MESSAGE()); + businessOrderService.updateById(businessOrderEntity); + } } } } else if (jsonObject.get("TYPE").equals("采购入库")) { @@ -894,19 +927,24 @@ public class YunguanInterfaceController { } QueryWrapper warehousingStorageProductQueryWrapper = new QueryWrapper<>(); warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getWarehousingStorageId,warehousingStorageEntity.getId()); - warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN()); + warehousingStorageProductQueryWrapper.lambda().eq(WarehousingStorageProductEntity::getOrdLn,yunguanPurchaseInBoundModel.getORD_LN().replaceFirst("^0*","")); WarehousingStorageProductEntity warehousingStorageProductEntity = warehousingStorageProductService.getOne(warehousingStorageProductQueryWrapper); if (ObjectUtil.isNotEmpty(warehousingStorageProductEntity)){ warehousingStorageProductEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); warehousingStorageProductEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); warehousingStorageProductEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); warehousingStorageProductService.updateById(warehousingStorageProductEntity); - } - if (yunguanPurchaseInBoundModel.getREAD_FLAG().equals("N")){ - warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); - warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); - warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); - warehousingStorageService.updateById(warehousingStorageEntity); + 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")) { + warehousingStorageEntity.setYunguanMark(yunguanPurchaseInBoundModel.getREAD_FLAG()); + warehousingStorageEntity.setYunguanTime(yunguanPurchaseInBoundModel.getREAD_TIME()); + warehousingStorageEntity.setYunguanMassage(yunguanPurchaseInBoundModel.getERR_MESSAGE()); + warehousingStorageService.updateById(warehousingStorageEntity); + } } } } @@ -926,10 +964,16 @@ public class YunguanInterfaceController { warehousingOutboundProductEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundProductEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); warehousingOutboundProductService.updateById(warehousingOutboundProductEntity); - if (!warehousingOutboundEntity.getYunguanMark().equals("N")){ + 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")){ warehousingOutboundEntity.setYunguanMark(yunguanSaleOutBoundModel.getREAD_FLAG()); warehousingOutboundEntity.setYunguanTime(yunguanSaleOutBoundModel.getREAD_TIME()); warehousingOutboundEntity.setYunguanMassage(yunguanSaleOutBoundModel.getERR_MESSAGE()); + warehousingOutboundService.updateById(warehousingOutboundEntity); } } } @@ -964,6 +1008,12 @@ public class YunguanInterfaceController { cwsettlementsummaryEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE()); cwsettlementsummaryService.updateById(cwsettlementsummaryEntity); } + if (yunguanPurchaseSettlementProductModel.getREAD_FLAG().equals("N")){ + cwsettlementEntity.setYunguanMark(yunguanPurchaseSettlementProductModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanPurchaseSettlementProductModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanPurchaseSettlementProductModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } } } } else if (jsonObject.get("TYPE").equals("销售结算头")) { @@ -986,15 +1036,25 @@ public class YunguanInterfaceController { cwsettlementQueryWrapper.lambda().eq(CwsettlementEntity::getCode,yunguanSaleSettlementProductModel.getINVOICE_NO()); CwsettlementEntity cwsettlementEntity = cwsettlementService.getOne(cwsettlementQueryWrapper); if (ObjectUtil.isNotEmpty(cwsettlementEntity)){ - QueryWrapper cwsettlementsummaryQueryWrapper = new QueryWrapper<>(); - cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId,cwsettlementEntity.getId()); - cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo,yunguanSaleSettlementProductModel.getATTRIBUTE4()); - CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper); - if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)){ - cwsettlementsummaryEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG()); - cwsettlementsummaryEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME()); - cwsettlementsummaryEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); - cwsettlementsummaryService.updateById(cwsettlementsummaryEntity); + if (StringUtils.isNotEmpty(yunguanSaleSettlementProductModel.getATTRIBUTE4())) { + int index = yunguanSaleSettlementProductModel.getATTRIBUTE4().lastIndexOf("-"); + String lineNo = yunguanSaleSettlementProductModel.getATTRIBUTE4().substring(index + 1).replaceFirst("^0*",""); + QueryWrapper cwsettlementsummaryQueryWrapper = new QueryWrapper<>(); + cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getSettlementId, cwsettlementEntity.getId()); + cwsettlementsummaryQueryWrapper.lambda().eq(CwsettlementsummaryEntity::getLineNo, lineNo); + CwsettlementsummaryEntity cwsettlementsummaryEntity = cwsettlementsummaryService.getOne(cwsettlementsummaryQueryWrapper); + if (ObjectUtil.isNotEmpty(cwsettlementsummaryEntity)) { + cwsettlementsummaryEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG()); + cwsettlementsummaryEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME()); + cwsettlementsummaryEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); + cwsettlementsummaryService.updateById(cwsettlementsummaryEntity); + } + if (yunguanSaleSettlementProductModel.getREAD_FLAG().equals("N")) { + cwsettlementEntity.setYunguanMark(yunguanSaleSettlementProductModel.getREAD_FLAG()); + cwsettlementEntity.setYunguanTime(yunguanSaleSettlementProductModel.getREAD_TIME()); + cwsettlementEntity.setYunguanMassage(yunguanSaleSettlementProductModel.getERR_MESSAGE()); + cwsettlementService.updateById(cwsettlementEntity); + } } } } @@ -1005,30 +1065,39 @@ public class YunguanInterfaceController { workOrderQueryWrapper.lambda().eq(WorkOrderEntity::getCode,yunguanProductProcessModel.getTASK_NO()); WorkOrderEntity workOrderEntity = workOrderService.getOne(workOrderQueryWrapper); if (ObjectUtil.isNotEmpty(workOrderEntity)){ - QueryWrapper productQueryWrapper = new QueryWrapper<>(); - productQueryWrapper.lambda().eq(ProductWarehouseEntity::getCode,yunguanProductProcessModel.getITEM_CD()); - ProductWarehouseEntity productWarehouseEntity = productWarehouseService.getOne(productQueryWrapper); +// 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()); - workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getProductId,productWarehouseEntity.getId()); + workOrderPrimaryQueryWrapper.lambda().eq(WorkOrderPrimaryEntity::getCode,yunguanProductProcessModel.getITEM_CD()); WorkOrderPrimaryEntity workOrderPrimaryEntity = workOrderPrimaryService.getOne(workOrderPrimaryQueryWrapper); if (ObjectUtil.isNotEmpty(workOrderPrimaryEntity)){ workOrderPrimaryEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); 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); } } else if (StringUtils.isNotEmpty(yunguanProductProcessModel.getPRD_TY()) && yunguanProductProcessModel.getPRD_TY().equals("产出")) { QueryWrapper workOrderProductQueryWrapper = new QueryWrapper<>(); workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getWorkId,workOrderEntity.getId()); - workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getProductId,productWarehouseEntity.getId()); + workOrderProductQueryWrapper.lambda().eq(WorkOrderProductEntity::getCode,yunguanProductProcessModel.getITEM_CD()); WorkOrderProductEntity workOrderProductEntity = workOrderProductService.getOne(workOrderProductQueryWrapper); if (ObjectUtil.isNotEmpty(workOrderProductEntity)){ workOrderProductEntity.setYunguanMark(yunguanProductProcessModel.getREAD_FLAG()); 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); } } } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanProductProcessModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanProductProcessModel.java index b4b3960d..4ed1f83b 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanProductProcessModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanProductProcessModel.java @@ -95,4 +95,7 @@ public class YunguanProductProcessModel { /** ESB错误信息 **/ @JSONField(name = "ESB_MESSAGE") private String ESB_MESSAGE; + /** 部门编码 **/ + @JSONField(name = "ADD_DEPT_CODE") + private String ADD_DEPT_CODE; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseSettlementModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseSettlementModel.java index 7cfade4f..cb426fdd 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseSettlementModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanPurchaseSettlementModel.java @@ -25,8 +25,8 @@ public class YunguanPurchaseSettlementModel { private String ACCOUNT_NO; @JSONField(name = "VENDOR_CD") private String VENDOR_CD; - @JSONField(name = "VENDOR_NAME") - private String VENDOR_NAME; + @JSONField(name = "VENDOR_NM") + private String VENDOR_NM; @JSONField(name = "VENDOR_SITE_CODE") private String VENDOR_SITE_CODE; @JSONField(name = "ATTRIBUTE10") @@ -100,4 +100,6 @@ public class YunguanPurchaseSettlementModel { private String ATTRIBUTE11; @JSONField(name = "INVOICE_AMOUNT") private BigDecimal INVOICE_AMOUNT; + @JSONField(name = "LINE_SUM") + private Integer LINE_SUM; } diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java index 21a4d343..572c423f 100644 --- a/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java +++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-entity/src/main/java/jnpf/model/yunguan/YunguanSaleOutBoundModel.java @@ -107,4 +107,7 @@ public class YunguanSaleOutBoundModel { /** ESB错误信息 **/ @JSONField(name = "ESB_MESSAGE") private String ESB_MESSAGE; + /** 采购订单号-行号 **/ + @JSONField(name = "PUR_ORDER") + private String PUR_ORDER; }