mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 21:52:07 +08:00
优化生产新增空小板接口逻辑修改,分页打包接口板材参数修改
This commit is contained in:
+15
@@ -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.LoginUser;
|
||||||
import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils;
|
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.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.orderItem.OrderItemDO;
|
||||||
import com.cf.imes.module.executor.dal.dataobject.ordermodel.OrderModelDO;
|
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.planitem.PlanItemDO;
|
||||||
import com.cf.imes.module.executor.dal.dataobject.processStepItem.OrderProcessStepItemDO;
|
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.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.orderItem.OrderItemMapper;
|
||||||
import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper;
|
import com.cf.imes.module.executor.dal.mysql.planitem.PlanItemMapper;
|
||||||
import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper;
|
import com.cf.imes.module.executor.dal.mysql.processStepItem.ProcessStepItemMapper;
|
||||||
@@ -84,6 +87,10 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
@Resource
|
@Resource
|
||||||
private PlanItemMapper planItemMapper;
|
private PlanItemMapper planItemMapper;
|
||||||
|
|
||||||
|
@Resource
|
||||||
|
private OrderBodyMapper orderBodyMapper;
|
||||||
|
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private SnowflakeIdWorker3rd idWorker;
|
private SnowflakeIdWorker3rd idWorker;
|
||||||
|
|
||||||
@@ -277,6 +284,14 @@ public class PlateServiceImpl implements PlateService {
|
|||||||
|
|
||||||
plateMapper.insertBatch(plateDOS);
|
plateMapper.insertBatch(plateDOS);
|
||||||
|
|
||||||
|
|
||||||
|
// 生产单柜体表新增数据
|
||||||
|
OrderBodyDO orderBodyDO = orderBodyMapper.selectById(reqVO.getBodyId());
|
||||||
|
|
||||||
|
orderBodyDO.setPlateNum(reqVO.getMultiple());
|
||||||
|
|
||||||
|
orderBodyMapper.updateById(orderBodyDO);
|
||||||
|
|
||||||
List<OrderItemDO> orderItemDOS = new ArrayList<>();
|
List<OrderItemDO> orderItemDOS = new ArrayList<>();
|
||||||
|
|
||||||
plateDOS.forEach(plateDO -> {
|
plateDOS.forEach(plateDO -> {
|
||||||
|
|||||||
-2
@@ -69,8 +69,6 @@ public interface OrderPackageMapper extends BaseMapperX<OrderPackageDO> {
|
|||||||
.eqIfPresent(OrderPackageDO::getId, packageId));
|
.eqIfPresent(OrderPackageDO::getId, packageId));
|
||||||
}
|
}
|
||||||
|
|
||||||
void updatePackStatus(Long packageId);
|
|
||||||
|
|
||||||
|
|
||||||
List<PackRespVO> selectPackPieceCount(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
|
List<PackRespVO> selectPackPieceCount(@Param("orderIds") List<Long> orderIds, @Param("organId") Long organId);
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-3
@@ -44,9 +44,8 @@
|
|||||||
from order_package op
|
from order_package op
|
||||||
join order_item oi on op.id = oi.package_id and op.organ_id = oi.organ_id
|
join order_item oi on op.id = oi.package_id and op.organ_id = oi.organ_id
|
||||||
|
|
||||||
where op.status <> 0
|
where oi.package_id !=0
|
||||||
and oi.package_id !=0
|
and oi.plate_id != 0
|
||||||
and plate_id != 0
|
|
||||||
and op.organ_id =#{organId}
|
and op.organ_id =#{organId}
|
||||||
and op.order_id in
|
and op.order_id in
|
||||||
<foreach item="id" collection="orderIds" open="(" separator="," close=")">
|
<foreach item="id" collection="orderIds" open="(" separator="," close=")">
|
||||||
|
|||||||
Reference in New Issue
Block a user