Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化生产新增空小板接口逻辑修改，分页打包接口板材参数修改

Browse Source
This commit is contained in:
liuzhaotian
2024-07-04 18:37:26 +08:00
parent 7862c8188c
commit 4465f401c8
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+15
View File
@@ -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<OrderItemDO> orderItemDOS = new ArrayList<>();
plateDOS.forEach(plateDO -> {
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.java
-2
View File
@@ -69,8 +69,6 @@ public interface OrderPackageMapper extends BaseMapperX<OrderPackageDO> {
.eqIfPresent(OrderPackageDO::getId, packageId));
}
void updatePackStatus(Long packageId);
List<PackRespVO> selectPackPieceCount(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
}
cf-module-prod-manage/cf-module-prod-manage-biz/src/main/resources/com/cf/imes/module/manage/dal/mysql/pack/OrderPackageMapper.xml
+2 -3
View File
@@ -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 &lt;&gt; 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
<foreach item="id" collection="orderIds" open="(" separator="," close=")">