From 4465f401c8452090af487209c65ad14536b8294c Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Thu, 4 Jul 2024 18:37:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=94=9F=E4=BA=A7=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=A9=BA=E5=B0=8F=E6=9D=BF=E6=8E=A5=E5=8F=A3=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=88=86=E9=A1=B5=E6=89=93?= =?UTF-8?q?=E5=8C=85=E6=8E=A5=E5=8F=A3=E6=9D=BF=E6=9D=90=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../executor/service/plate/PlateServiceImpl.java | 15 +++++++++++++++ .../manage/dal/mysql/pack/OrderPackageMapper.java | 2 -- .../manage/dal/mysql/pack/OrderPackageMapper.xml | 5 ++--- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index 2b132409c..809f86733 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -19,11 +19,14 @@ import com.cf.imes.framework.mybatis.core.query.MPJLambdaWrapperX; import com.cf.imes.framework.security.core.LoginUser; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.goods.vo.GoodsSaveReqVO; +import com.cf.imes.module.executor.dal.dataobject.orderBody.OrderBodyDO; import com.cf.imes.module.executor.dal.dataobject.orderItem.OrderItemDO; import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO; import com.cf.imes.module.executor.dal.dataobject.planitem.PlanItemDO; import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO; import com.cf.imes.module.executor.dal.mysql.goods.GoodsMapper; +import com.cf.imes.module.executor.dal.mysql.orderBody.OrderBodyMapper; +import com.cf.imes.module.executor.dal.mysql.orderGroup.OrderGroupMapper; import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper; import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper; @@ -84,6 +87,10 @@ public class PlateServiceImpl implements PlateService { @Resource private PlanItemMapper planItemMapper; + @Resource + private OrderBodyMapper orderBodyMapper; + + @Resource private SnowflakeIdWorker3rd idWorker; @@ -277,6 +284,14 @@ public class PlateServiceImpl implements PlateService { plateMapper.insertBatch(plateDOS); + + // 生产单柜体表新增数据 + OrderBodyDO orderBodyDO = orderBodyMapper.selectById(reqVO.getBodyId()); + + orderBodyDO.setPlateNum(reqVO.getMultiple()); + + orderBodyMapper.updateById(orderBodyDO); + List orderItemDOS = new ArrayList<>(); plateDOS.forEach(plateDO -> { diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java index 43f48d355..122440b7f 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java @@ -69,8 +69,6 @@ public interface OrderPackageMapper extends BaseMapperX { .eqIfPresent(OrderPackageDO::getId, packageId)); } - void updatePackStatus(Long packageId); - List selectPackPieceCount(@Param("orderIds") List orderIds, @Param("organId") Long organId); } diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml index 104fce185..76ae09909 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml @@ -44,9 +44,8 @@ from order_package op join order_item oi on op.id = oi.package_id and op.organ_id = oi.organ_id - where op.status <> 0 - and oi.package_id !=0 - and plate_id != 0 + where oi.package_id !=0 + and oi.plate_id != 0 and op.organ_id =#{organId} and op.order_id in