计划模块(白坯订单拆分BUG解决)

highway
wws 1 year ago
parent 47dfd51ab1
commit ed94033b38

@ -162,7 +162,12 @@ public class ProOrderServiceImpl implements IProOrderService {
proOrder.setQuantitySplit(splitOrderDTO.getSplitNum());
proOrder.setQuantity(proOrder.getQuantitySplit());
proOrder.setStatus("o1");
proOrder.setCarNum(proOrder.getCarNum()+splitOrderDTO.getCarNum());
if (proOrder.getCarNum() != null) {
proOrder.setCarNum(proOrder.getCarNum()+splitOrderDTO.getCarNum());
}else {
proOrder.setCarNum(splitOrderDTO.getCarNum());
}
if (flag) {
proOrder.setStatus("o2");
}

@ -207,7 +207,9 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
return error("订单下存在已下发湿料计划工单,不可删除!");
}
}
}
// 删除逻辑
if (proOrderWorkorderList.size() > 0) {
for (ProOrderWorkorder workorder : proOrderWorkorderList) {
// 删除批次信息
proOrderWorkorderBatchMapper.deleteProOrderWorkorderBatchByWorkorderId(workorder.getWorkorderId());
@ -216,7 +218,6 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
// 删除工单
proOrderWorkorderMapper.deleteProOrderWorkorderByWorkorderId(workorder.getWorkorderId());
}
}
}
// 删除子订单

@ -278,6 +278,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="status != null">status = #{status},</if>
<if test="carNum != null">car_num = #{carNum},</if>
</trim>
where id = #{id}
</update>
@ -331,6 +332,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="status != null">status = #{status},</if>
<if test="carNum != null">car_num = #{carNum},</if>
</trim>
where id = #{id}
</update>

Loading…
Cancel
Save