提交

src/main/java/cn/ezhizao/project/business/auxiliaryDaywork/controller/BizDayworkAuxiliaryItemController.java

@@ -240,8 +240,11 @@ public class BizDayworkAuxiliaryItemController extends BaseController {
         // 修改报工表的合格数量
         BizDaywork bizDaywork = bizDayworkService.getById(bizDayworkAuxiliaryItem.getDayworkId());
         List<BizDayworkItem> bizDayworkItems = bizDayworkItemService.query().eq("daywork_id", bizDaywork.getId()).orderByDesc("create_time").list();
-        bizDaywork.setProcessQualifiedNum(bizDaywork.getProcessQualifiedNum() - rejectNum);
-        bizDaywork.setTemporaryProcessQualifiedNum(bizDaywork.getTemporaryProcessQualifiedNum() - rejectNum);
+        bizDaywork.setProcessQualifiedNum(bizDaywork.getProcessQualifiedNum() != 0 ? bizDaywork.getProcessQualifiedNum() - rejectNum : 0);
+        bizDaywork.setTemporaryProcessQualifiedNum(bizDaywork.getTemporaryProcessQualifiedNum() != 0 ? bizDaywork.getTemporaryProcessQualifiedNum() - rejectNum : 0);
+        if (bizDaywork.getProcessQualifiedNum().compareTo(0) < 0 || bizDaywork.getTemporaryProcessQualifiedNum().compareTo(0) < 0) {
+            return error("当前报工数量不能小于0");
+        }
         BizDayworkItem lastDaywork = bizDayworkItems.stream().filter(v -> v.getStatus().compareTo("4") < 0).sorted(Comparator.comparing(BizDayworkItem::getProcessStepNumber).thenComparing(BizDayworkItem::getStatus).reversed()).findFirst().orElse(new BizDayworkItem());
         // 假设最新报工已完成 则修改下序报工的投产数量
         if (lastDaywork.getStatus().compareTo("3") < 0) {

src/main/resources/mybatis/business/auxiliaryDaywork/BizDayworkAuxiliaryItemMapper.xml

@@ -155,6 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT t1.* FROM biz_daywork_auxiliary_item t1 left join biz_product t3 on t3.id = t1.product_id left join biz_lot t4 on t4.id = t1.lot_id
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0
+            <if test="id != null"> AND t1.id = #{id}</if>
             <if test="deptName != null  and deptName != ''"> AND t1.dept_name like concat('%', #{deptName}, '%')</if>
             <if test="status != null  and status != ''"> AND t1.status = #{status}</if>
             <if test="userName != null  and userName != ''"> AND t1.user_name like concat('%', #{userName}, '%')</if>