From 21e014ad7d5a4f81ad9ab477a36bbdb8a2493b41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Sun, 30 Jul 2023 11:38:34 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml index 92772587..c0373191 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml @@ -67,7 +67,7 @@ - select * - from io_order_detail_code + from io_order_detail_result AND orderIdFk = #{orderIdFk} @@ -133,6 +133,6 @@ AND batchNo = #{batchNo} - group by io_order_detail_code.id + group by io_order_detail_result.id From 9f9dab9a0c203f330dfaf81d343dcf72ec584622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Mon, 31 Jul 2023 11:23:27 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoOrderUtilsService.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 24ac15c6..02fcb210 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -96,7 +96,7 @@ public class IoOrderUtilsService { ioCodeTempEntity1.setExpireDate(ioCodeEntity.getExpireDate()); ioCodeTempEntity1.setSerialNo(ioCodeEntity.getSerialNo()); ioCodeTempEntity1.setPackageLevel(ioCodeEntity.getPackageLevel()); - ioCodeTempEntity1.setSupId(ioCodeEntity.getSupId()); + ioCodeTempEntity1.setSupId(platformLinkRespons.getCustomerId()); ioCodeTempEntity1.setCount(ioCodeEntity.getCount()); ioCodeTempEntity1.setReCount(ioCodeEntity.getReCount()); ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode()); @@ -135,7 +135,7 @@ public class IoOrderUtilsService { ioOrderDetailCodeEntity1.setPrice(ioOrderDetailCodeEntity.getPrice()); ioOrderDetailCodeEntity1.setSpec(ioOrderDetailCodeEntity.getSpec()); ioOrderDetailCodeEntity1.setCertCode(ioOrderDetailCodeEntity.getCertCode()); - ioOrderDetailCodeEntity1.setSupId(ioOrderDetailCodeEntity.getSupId()); + ioOrderDetailCodeEntity1.setSupId(platformLinkRespons.getCustomerId()); ioOrderDetailCodeEntity1.setBindSupStatus(ioOrderDetailCodeEntity.getBindSupStatus()); ioOrderDetailCodeEntity1.setCount(ioOrderDetailCodeEntity.getCount()); ioOrderDetailCodeEntity1.setReCount(ioOrderDetailCodeEntity.getReCount()); @@ -175,7 +175,7 @@ public class IoOrderUtilsService { ioOrderDetailBizEntity1.setPrice(ioOrderDetailBizEntity.getPrice()); ioOrderDetailBizEntity1.setSpec(ioOrderDetailBizEntity.getSpec()); ioOrderDetailBizEntity1.setCertCode(ioOrderDetailBizEntity.getCertCode()); - ioOrderDetailBizEntity1.setSupId(ioOrderDetailBizEntity.getSupId()); + ioOrderDetailBizEntity1.setSupId(platformLinkRespons.getCustomerId()); ioOrderDetailBizEntity1.setBindSupStatus(ioOrderDetailBizEntity.getBindSupStatus()); ioOrderDetailBizEntity1.setCount(ioOrderDetailBizEntity.getCount()); ioOrderDetailBizEntity1.setFilePath(ioOrderDetailBizEntity.getFilePath()); @@ -215,7 +215,7 @@ public class IoOrderUtilsService { ioOrderDetailResultEntity1.setPrice(ioOrderDetailResultEntity.getPrice()); ioOrderDetailResultEntity1.setSpec(ioOrderDetailResultEntity.getSpec()); ioOrderDetailResultEntity1.setCertCode(ioOrderDetailResultEntity.getCertCode()); - ioOrderDetailResultEntity1.setSupId(ioOrderDetailResultEntity.getSupId()); + ioOrderDetailResultEntity1.setSupId(platformLinkRespons.getCustomerId()); ioOrderDetailResultEntity1.setBindSupStatus(ioOrderDetailResultEntity.getBindSupStatus()); ioOrderDetailResultEntity1.setCount(ioOrderDetailResultEntity.getCount()); ioOrderDetailResultEntities.add(ioOrderDetailResultEntity1); @@ -258,9 +258,7 @@ public class IoOrderUtilsService { ioOrderEntity1.setBillNo(billNO); ioOrderEntity1.setMainAction(ioOrderEntity.getMainAction()); ioOrderEntity1.setAction(platformLinkRespons.getTargetAction()); - ioOrderEntity1.setFromCorp(ioOrderEntity.getFromCorp()); - ioOrderEntity1.setFromDeptCode(ioOrderEntity.getFromDeptCode()); - ioOrderEntity1.setFromInvCode(ioOrderEntity.getFromInvCode()); + ioOrderEntity1.setFromCorp(platformLinkRespons.getCustomerId()); ioOrderEntity1.setOrderType(3); ioOrderEntity1.setFromType(1); if (!checkUdi) { @@ -275,7 +273,7 @@ public class IoOrderUtilsService { ioOrderEntity1.setCreateUser(authAdmins.getId() + ""); ioOrderEntity1.setUpdateUser(authAdmins.getId() + ""); ioOrderEntity1.setUpdateTime(new Date()); - ioOrderEntity1.setCustomerId(platformLinkRespons.getUnitId()); + ioOrderEntity1.setCustomerId(platformLinkRespons.getCustomerId()); ioOrderEntity1.setDeptCode(platformLinkRespons.getInvCode()); ioOrderEntity1.setInvCode(platformLinkRespons.getInvSubCode()); From 5ca5575e96e45c7e9b33789339565d47e2b5e274 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 31 Jul 2023 21:07:16 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E5=8D=8F=E8=B0=83=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderDetailResultController.java | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java index d4742b0b..04cb3c4f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderDetailResultController.java @@ -240,18 +240,18 @@ public class IoOrderDetailResultController extends BaseController { //查询第三方产品产品类别 ThrProductsEntity thrProductsEntity = thrProductsService.filterThrProductsByMainId(ioOrderDetailResultResponse.getBindRlFk() + ""); //查询发票信息 - String dateStr=""; - List encodeList=new ArrayList<>(); - IoOrderInvoiceRequest ioOrderInvoiceRequest=new IoOrderInvoiceRequest(); + String dateStr = ""; + List encodeList = new ArrayList<>(); + IoOrderInvoiceRequest ioOrderInvoiceRequest = new IoOrderInvoiceRequest(); ioOrderInvoiceRequest.setBindRlFk(ioOrderDetailResultResponse.getBindRlFk() + ""); ioOrderInvoiceRequest.setOrderIdFk(ioOrderDetailResultResponse.getOrderIdFk()); ioOrderInvoiceRequest.setBatchNo(ioOrderDetailResultResponse.getBatchNo()); - List ioOrderInvoiceEntityList=ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); + List ioOrderInvoiceEntityList = ioOrderInvoiceService.selectOrderInvoice(ioOrderInvoiceRequest); for (IoOrderInvoiceEntity ioOrderInvoiceEntity : ioOrderInvoiceEntityList) { encodeList.add(ioOrderInvoiceEntity.getInvoiceEncode()); } - String encode=String.join(",", encodeList); - if(CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)){ + String encode = String.join(",", encodeList); + if (CollectionUtils.isNotEmpty(ioOrderInvoiceEntityList)) { SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); dateStr = sdf.format(ioOrderInvoiceEntityList.get(0).getCreateTime()); } @@ -278,7 +278,7 @@ public class IoOrderDetailResultController extends BaseController { ioOrderDetailResultData.put("billTypeName", ioOrderDetailResultResponse.getBillTypeName() == null ? ' ' : ioOrderDetailResultResponse.getBillTypeName()); ioOrderDetailResultData.put("mainAction", ioOrderDetailResultResponse.getMainAction() == null ? ' ' : ioOrderDetailResultResponse.getMainAction()); ioOrderDetailResultData.put("auditTime", ioOrderDetailResultResponse.getAuditTime() == null ? ' ' : formatter.format(ioOrderDetailResultResponse.getAuditTime())); - if(thrProductsEntity!=null){ + if (thrProductsEntity != null) { ioOrderDetailResultData.put("cplb", thrProductsEntity.getCplb() == null ? ' ' : thrProductsEntity.getCplb()); } ioOrderDetailResultData.put("invoiceEncode", encode); @@ -294,7 +294,6 @@ public class IoOrderDetailResultController extends BaseController { } - /** * 提供UDI协调调用单据明细 */ @@ -311,7 +310,7 @@ public class IoOrderDetailResultController extends BaseController { if (cptTraceOrderResponse.getCorpType() == 1 || cptTraceOrderResponse.getCorpType() == 2) { CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse(); cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo()); - cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime())); + cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime(), "yyyy-MM-dd HH:mm:ss")); cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType()); if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) { if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode())) From 24739fb392547721f560ac11103386e7ee08e0a4 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Mon, 31 Jul 2023 21:31:33 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=BB=B4=E6=8A=A4?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/impl/IoOrderServiceImpl.java | 35 ++++++++++++------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java index 8547e608..bcb36fcc 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java @@ -301,13 +301,20 @@ public class IoOrderServiceImpl implements IoOrderService { //更新扫码单据详情 IoOrderDetailCodeEntity ioOrderDetailCodeEntity = ioOrderDetailCodeService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); - ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); - ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + + if (ioOrderDetailCodeEntity != null) { + ioOrderDetailCodeEntity.setReCount(ioOrderDetailCodeEntity.getReCount() - reCount); + ioOrderDetailCodeService.update(ioOrderDetailCodeEntity); + } + //更新结果详情 IoOrderDetailResultEntity ioOrderDetailResultEntity = ioOrderDetailResultService.findByUnique(ioCodeEntity.getOrderId(), ioCodeEntity.getRelId(), ioCodeEntity.getBatchNo()); - ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); - ioOrderDetailResultService.update(ioOrderDetailResultEntity); + if (ioOrderDetailResultEntity != null) { + ioOrderDetailResultEntity.setReCount(ioOrderDetailResultEntity.getReCount() - reCount); + ioOrderDetailResultService.update(ioOrderDetailResultEntity); + } + } else { //如果数量扣减之后为0，直接删除此条码 codeService.deleteById(ioCodeEntity.getId()); @@ -371,15 +378,17 @@ public class IoOrderServiceImpl implements IoOrderService { invPreProductService.update(invProductEntity); } else { //普通库存 InvProductDetailEntity invProductDetailEntity = invProductDetailService.selectByCode(billNo, code); - int count = invProductDetailEntity.getCount() - 1; - if (count == 0) { - invProductDetailService.deleteById(invProductDetailEntity.getId()); - } else { - //更新详情表 - invProductDetailEntity.setCount(count); - int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode()); - invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); - invProductDetailService.update(invProductDetailEntity); + if (invProductDetailEntity != null) { + int count = invProductDetailEntity.getCount() - 1; + if (count == 0) { + invProductDetailService.deleteById(invProductDetailEntity.getId()); + } else { + //更新详情表 + invProductDetailEntity.setCount(count); + int reCount = udiCalCountUtil.getActCount(invProductDetailEntity.getNameCode()); + invProductDetailEntity.setReCount(invProductDetailEntity.getReCount() - reCount); + invProductDetailService.update(invProductDetailEntity); + } } //更新产品表 InvProductEntity invProductEntity = invProductService.selectByUnique(invProductDetailEntity.getRelId(), invProductDetailEntity.getBatchNo(), invProductDetailEntity.getSupId(), invProductDetailEntity.getDeptCode(), invProductDetailEntity.getInvCode());