From 8f11acd645f36c5a2c1fea086203762d7f7a7673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Fri, 16 Jun 2023 18:03:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dao/inout/IoOrderDetailResultDao.java | 2 +- .../service/inout/IoOrderUtilsService.java | 52 ++++++++++--------- 2 files changed, 29 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java index 2a5fe106..52185d55 100644 --- a/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java +++ b/src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java @@ -7,7 +7,7 @@ import com.glxp.api.res.inout.IoOrderDetailResultResponse; import java.util.List; -public interface IoOrderDetailResultDao extends BaseMapperPlus { +public interface IoOrderDetailResultDao extends BaseMapperPlus { /** * 查询单据扫码明细VO列表 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 a38a65ae..5a483d3f 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -92,25 +92,26 @@ public class IoOrderUtilsService { } else { ioCodeTempEntity1.setRelId(udiRlSupEntityList.get(0).getId()); map.put(ioCodeTempEntity.getRelId() + "", udiRlSupEntityList.get(0)); + + ioCodeTempEntity1.setOrderId(billNO); + ioCodeTempEntity1.setCode(ioCodeTempEntity.getCode()); + ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction()); + ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction()); + ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode()); + ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo()); + ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate()); + ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate()); + ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo()); + ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel()); + ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId()); + ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount()); + ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount()); + ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode()); + ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode()); + ioCodeTempEntity1.setUpdateTime(new Date()); + ioCodeTempEntity1.setCreateTime(new Date()); + ioCodeTempEntities.add(ioCodeTempEntity1); } - ioCodeTempEntity1.setOrderId(billNO); - ioCodeTempEntity1.setCode(ioCodeTempEntity.getCode()); - ioCodeTempEntity1.setMainAction(ioCodeTempEntity.getMainAction()); - ioCodeTempEntity1.setAction(platformLinkRespons.getTargetAction()); - ioCodeTempEntity1.setNameCode(ioCodeTempEntity.getNameCode()); - ioCodeTempEntity1.setBatchNo(ioCodeTempEntity.getBatchNo()); - ioCodeTempEntity1.setProduceDate(ioCodeTempEntity.getProduceDate()); - ioCodeTempEntity1.setExpireDate(ioCodeTempEntity.getExpireDate()); - ioCodeTempEntity1.setSerialNo(ioCodeTempEntity.getSerialNo()); - ioCodeTempEntity1.setPackageLevel(ioCodeTempEntity.getPackageLevel()); - ioCodeTempEntity1.setSupId(ioCodeTempEntity.getSupId()); - ioCodeTempEntity1.setCount(ioCodeTempEntity.getCount()); - ioCodeTempEntity1.setReCount(ioCodeTempEntity.getReCount()); - ioCodeTempEntity1.setDeptCode(platformLinkRespons.getInvCode()); - ioCodeTempEntity1.setInvCode(platformLinkRespons.getInvSubCode()); - ioCodeTempEntity1.setUpdateTime(new Date()); - ioCodeTempEntity1.setCreateTime(new Date()); - ioCodeTempEntities.add(ioCodeTempEntity1); } //扫码单据生成 @@ -127,6 +128,7 @@ public class IoOrderUtilsService { ioOrderDetailCodeEntity1.setBindRlFk(null); ioOrderDetailCodeEntity1.setUuidFk(null); } + ioOrderDetailCodeEntity1.setId(IdUtil.getSnowflakeNextId()); ioOrderDetailCodeEntity1.setNameCode(ioOrderDetailCodeEntity.getNameCode()); ioOrderDetailCodeEntity1.setBatchNo(ioOrderDetailCodeEntity.getBatchNo()); ioOrderDetailCodeEntity1.setProductDate(ioOrderDetailCodeEntity.getProductDate()); @@ -163,7 +165,7 @@ public class IoOrderUtilsService { ioOrderDetailBizEntity1.setBindRlFk(null); ioOrderDetailBizEntity1.setUuidFk(null); } - + ioOrderDetailBizEntity1.setId(IdUtil.getSnowflakeNextId()); ioOrderDetailBizEntity1.setNameCode(ioOrderDetailBizEntity.getNameCode()); ioOrderDetailBizEntity1.setBatchNo(ioOrderDetailBizEntity.getBatchNo()); ioOrderDetailBizEntity1.setProductDate(ioOrderDetailBizEntity.getProductDate()); @@ -234,6 +236,7 @@ public class IoOrderUtilsService { ioOrderInvoiceEntity1.setBindRlFk(null); } + ioOrderInvoiceEntity1.setId(IdUtil.getSnowflakeNextId()); ioOrderInvoiceEntity1.setBatchNo(ioOrderInvoiceEntity.getBatchNo()); ioOrderInvoiceEntity1.setProductDate(ioOrderInvoiceEntity.getProductDate()); ioOrderInvoiceEntity1.setExpireDate(ioOrderInvoiceEntity.getExpireDate()); @@ -260,6 +263,7 @@ public class IoOrderUtilsService { ioOrderEntity1.setFromCorp(ioOrderEntity.getFromCorp()); ioOrderEntity1.setFromDeptCode(ioOrderEntity.getFromDeptCode()); ioOrderEntity1.setFromInvCode(ioOrderEntity.getFromInvCode()); + ioOrderEntity1.setOrderType(3); ioOrderEntity1.setFromType(1); if (!checkUdi) { ioOrderEntity1.setStatus(1); @@ -279,11 +283,11 @@ public class IoOrderUtilsService { //结果插入 ioOrderService.insertOrder(ioOrderEntity1); - ioOrderDetailBizDao.insertIgnoreBatchs(ioOrderDetailBizEntities); - ioOrderDetailCodeDao.insertIgnoreBatchs(ioOrderDetailCodeEntities); - ioCodeTempDao.insertIgnoreBatchs(ioCodeTempEntities); - ioOrderDetailResultDao.insertIgnoreBatchs(ioOrderDetailResultEntities); - ioOrderInvoiceMapper.insertIgnoreBatchs(ioOrderInvoiceEntities); + ioOrderDetailBizDao.insertBatch(ioOrderDetailBizEntities); + ioOrderDetailCodeDao.insertBatch(ioOrderDetailCodeEntities); + ioCodeTempDao.insertBatch(ioCodeTempEntities); + ioOrderDetailResultDao.insertBatch(ioOrderDetailResultEntities); + ioOrderInvoiceMapper.insertBatch(ioOrderInvoiceEntities); return true; }