From 6f43a8a666ba84e9ddcacb7a09f1a23c1af669c5 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Thu, 16 Nov 2023 18:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=B7=BB=E5=8A=A0=E8=BF=87?= =?UTF-8?q?=E6=BB=A4=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=A2=86=E7=94=A8=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E6=B5=81=E8=BD=AC=E7=94=9F=E6=88=90=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8D=95=E6=8D=AE=EF=BC=8CDI=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=BA=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inout/IoOrderReviewController.java | 1 + .../controller/inv/InvProductController.java | 1 - .../purchase/IoPurChangeService.java | 31 ++++++++++++++----- .../mybatis/mapper/inv/InvPreProductDao.xml | 6 ++-- .../mybatis/mapper/inv/InvPreinProductDao.xml | 6 ++-- .../mybatis/mapper/inv/invProductDao.xml | 7 +++-- 6 files changed, 35 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java index fab3de2ac..66a258ed8 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java @@ -570,6 +570,7 @@ public class IoOrderReviewController extends BaseController { ioCheckInoutService.check(orderEntity.getBillNo()); } } + orderEntity = orderService.findByBillNo(orderEntity.getBillNo()); if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_REW) { return ResultVOUtils.error(500, "非待审核单据！"); } diff --git a/src/main/java/com/glxp/api/controller/inv/InvProductController.java b/src/main/java/com/glxp/api/controller/inv/InvProductController.java index e3de92f60..0598fcb3a 100644 --- a/src/main/java/com/glxp/api/controller/inv/InvProductController.java +++ b/src/main/java/com/glxp/api/controller/inv/InvProductController.java @@ -75,7 +75,6 @@ public class InvProductController extends BaseController { filterInvProductRequest.setNameCode(FilterUdiUtils.getDiStr(filterInvProductRequest.getUdiCode())); } - if (StrUtil.isBlank(filterInvProductRequest.getInvCode())) { List invCodes = warehouseUserService.selectCodeByUser(customerService.getUserIdStr()); if (CollUtil.isNotEmpty(invCodes)) { diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index a1fb8b69d..4cb976e94 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -7,6 +7,7 @@ import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; import com.glxp.api.dao.basic.CompanyProductRelevanceDao; import com.glxp.api.entity.basic.BasicBusTypeChangeEntity; +import com.glxp.api.entity.basic.BasicBussinessTypeEntity; import com.glxp.api.entity.basic.BasicProductsEntity; import com.glxp.api.entity.basic.CompanyProductRelevanceEntity; import com.glxp.api.entity.inout.IoOrderDetailBizEntity; @@ -15,6 +16,7 @@ import com.glxp.api.entity.inout.PurReceiveDetailEntity; import com.glxp.api.entity.inout.PurReceiveEntity; import com.glxp.api.entity.purchase.*; import com.glxp.api.service.basic.IBasicBusTypeChangeService; +import com.glxp.api.service.basic.IBasicBussinessTypeService; import com.glxp.api.service.inout.IoOrderDetailBizService; import com.glxp.api.service.inout.IoOrderService; import com.glxp.api.service.inout.impl.ReceiveDetailService; @@ -251,6 +253,9 @@ public class IoPurChangeService { } + @Resource + IBasicBussinessTypeService bussinessTypeService; + //领用单生成扫码单据 public void purReceiveGen(PurReceiveEntity purReceiveEntity) { BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.selectByOriginAction(ConstantStatus.BUS_ORDER_HCLY); @@ -259,15 +264,29 @@ public class IoPurChangeService { // Map> map = purReceiveDetailEntityList.stream().collect(Collectors.groupingBy(PurReceiveDetailEntity::getSupId)); String billNo = ""; if (basicBusTypeChangeEntity != null && StrUtil.isNotEmpty(basicBusTypeChangeEntity.getTargetAction()) && basicBusTypeChangeEntity.isEnable() == true) { - //生产单据表信息 + //生成单据表信息 + + BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(basicBusTypeChangeEntity.getTargetAction()); + IoOrderEntity ioOrderEntity = new IoOrderEntity(); + if (bussinessTypeEntity.getMainAction().equals(ConstantType.TYPE_PUT)) { + ioOrderEntity.setFromDeptCode(purReceiveEntity.getTargetDeptCode()); + ioOrderEntity.setFromInvCode(purReceiveEntity.getTargetInvCode()); + ioOrderEntity.setDeptCode(purReceiveEntity.getDeptCode()); + ioOrderEntity.setInvCode(purReceiveEntity.getInvCode()); + } else { + ioOrderEntity.setFromDeptCode(purReceiveEntity.getDeptCode()); + ioOrderEntity.setFromInvCode(purReceiveEntity.getInvCode()); + ioOrderEntity.setDeptCode(purReceiveEntity.getTargetDeptCode()); + ioOrderEntity.setInvCode(purReceiveEntity.getTargetInvCode()); + } + ioOrderEntity.setMainAction(bussinessTypeEntity.getMainAction()); + ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); + ioOrderEntity.setBillNo(gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd"))); ioOrderEntity.setCorpOrderId(purReceiveEntity.getBillNo()); ioOrderEntity.setFromReceiveBillNo(purReceiveEntity.getBillNo()); - ioOrderEntity.setMainAction(ConstantType.TYPE_PUT); - ioOrderEntity.setAction(basicBusTypeChangeEntity.getTargetAction()); - ioOrderEntity.setFromDeptCode(purReceiveEntity.getTargetDeptCode()); - ioOrderEntity.setFromInvCode(purReceiveEntity.getTargetInvCode()); + ioOrderEntity.setFromType(ConstantStatus.FROM_RECEIVE); if (basicBusTypeChangeEntity.getAuditStatus() == 1) { ioOrderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE); @@ -282,8 +301,6 @@ public class IoPurChangeService { ioOrderEntity.setUpdateTime(new Date()); ioOrderEntity.setUpdateUser(purReceiveEntity.getCreateUser()); ioOrderEntity.setCustomerId("110"); - ioOrderEntity.setDeptCode(purReceiveEntity.getDeptCode()); - ioOrderEntity.setInvCode(purReceiveEntity.getInvCode()); ioOrderService.insertOrder(ioOrderEntity); billNo += ioOrderEntity.getBillNo() + ","; //插入业务单表 diff --git a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml index 60b5c108e..e3b8d08c9 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreProductDao.xml @@ -36,7 +36,7 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ipp.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') AND ipp.relIdFk = #{relIdFk} @@ -125,10 +125,10 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ipp.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') - AND ipp.nameCode = #{diCode} + AND bp.nameCode = #{diCode} AND ipp.relIdFk = #{relIdFk} diff --git a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml index 69e73716c..9b687383b 100644 --- a/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/InvPreinProductDao.xml @@ -35,7 +35,7 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ipp.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') AND ipp.relIdFk = #{relIdFk} @@ -123,10 +123,10 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ipp.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') - AND ipp.nameCode = #{diCode} + AND bp.nameCode = #{diCode} AND ipp.relIdFk = #{relIdFk} diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml index 157f66a3f..98ae6bb05 100644 --- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml +++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml @@ -362,7 +362,7 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ip.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') AND ip.relIdFk = #{relIdFk} @@ -419,6 +419,7 @@ select ip.id, ip.nameCode, bp.cpmctymc, + bp.measname, ip.relIdFk, bp.ggxh, ip.batchNo, @@ -453,10 +454,10 @@ AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') - AND ip.nameCode like concat('%', #{nameCode}, '%') + AND bp.nameCode like concat('%', #{nameCode}, '%') - AND ip.nameCode = #{diCode} + AND bp.nameCode = #{diCode} AND ip.relIdFk = #{relIdFk}