Merge remote-tracking branch 'origin/master'

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkController.java

@@ -840,7 +840,7 @@ public class BizDayworkController extends BaseController {
             //查询出该生产计划的当前生产批数
             Integer getdayworkNum = bizDayworkService.getdayworkNum(bizDaywork.getProductionPlanDetailId());
             Integer num = (getdayworkNum != null) ? getdayworkNum.intValue() : 0; // 如果 dayworkNum 为 null，则赋值为默认值 0
-            if (num < lotNumber || (bizDaywork.getIsWasteRecycling() == null ? false : bizDaywork.getIsWasteRecycling() == 1) || bizDaywork.getFromId() != 0) {
+            if (num < lotNumber || (bizDaywork.getIsWasteRecycling() == null ? false : bizDaywork.getIsWasteRecycling() == 1) || bizDaywork.getFromId() != 0 || bizDaywork.getIsSuperaddition() == 1) {
                 //查询该批次号是否已经被领取
                 List<BizDaywork> lotId = bizDayworkService.query().eq("lot_id", bizDaywork.getLotId()).list();
                 if (!lotId.isEmpty()) {

src/main/java/cn/ezhizao/project/business/product/controller/BizDayworkItemController.java

@@ -20,6 +20,8 @@ import cn.ezhizao.project.business.resourceGroup.domain.BizProductionResourceGro
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupDetailService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupService;
 import cn.ezhizao.project.business.resourceGroup.service.IBizProductionResourceGroupSubPlanService;
+import cn.ezhizao.project.business.takeStockPeriod.domain.BizTakeStockPeriod;
+import cn.ezhizao.project.business.takeStockPeriod.service.IBizTakeStockPeriodService;
 import cn.ezhizao.project.business.technologicalProcessDetail.domain.BizTechnologicalProcessDetail;
 import cn.ezhizao.project.business.technologicalProcessDetail.service.IBizTechnologicalProcessDetailService;
 import cn.ezhizao.project.business.turnover.domain.BizTurnover;
@@ -104,6 +106,8 @@ public class BizDayworkItemController extends BaseController {
     private IBizDeptProcessService bizDeptProcessService;
     @Resource
     private IBizDayworkItemExamineService bizDayworkItemExamineService;
+    @Resource
+    private IBizTakeStockPeriodService bizTakeStockPeriodService;
     /**
      * 查询报工记录列表
      */
@@ -1109,6 +1113,11 @@ public class BizDayworkItemController extends BaseController {
     @Transactional
     @PostMapping("/turnoverOutsource")
     public AjaxResult turnoverOutsource(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException,IllegalAccessException {
+        //判断当前是否在盘点
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
+        if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
+            return error("当前在盘点，禁止投产");
+        }
         // 设置工时
         // 获取箱子关联的所有批次
         boolean batch = true;
@@ -1187,6 +1196,11 @@ public class BizDayworkItemController extends BaseController {
     @Transactional
     @PostMapping("/turnover")
     public AjaxResult turnover(@RequestBody BizDayworkItem bizDayworkItem) throws NoSuchFieldException,IllegalAccessException {
+        //判断当前是否在盘点
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
+        if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
+            return error("当前在盘点，禁止投产");
+        }
         // 设置工时
         // 获取箱子关联的所有批次
         boolean batch = true;

src/main/java/cn/ezhizao/project/business/product/domain/BizDaywork.java

@@ -221,4 +221,6 @@ public class BizDaywork extends BaseEntity
     private List<BizInspectionChamber> inspectionChambers;
     @TableField(exist = false)
     private Integer prodNum;
+    @TableField(exist = false)
+    private Integer isSuperaddition;
 }

src/main/java/cn/ezhizao/project/business/product/domain/BizLot.java

@@ -156,5 +156,6 @@ public class BizLot extends BaseEntity
     private String processStepNumber;
     @TableField(exist = false)
     private List<BizInspectionChamber> inspectionChamberList;
+    private Integer isSuperaddition;
 
 }

src/main/java/cn/ezhizao/project/business/takeStockPeriod/controller/BizTakeStockPeriodController.java

@@ -66,6 +66,15 @@ public class BizTakeStockPeriodController extends BaseController
             return success(new ArrayList<>());
         }
     }
+    @GetMapping("/isTakeStock")
+    public AjaxResult isTakeStock()
+    {
+        BizTakeStockPeriod bizTakeStockPeriod = bizTakeStockPeriodService.query().eq("status",1).one();
+        if(bizTakeStockPeriod!=null && bizTakeStockPeriod.getStatus() == 1) {
+            return success(true);
+        }
+        return success(false);
+    }
 
     /**
      * 导出盘点时间列表

src/main/java/cn/ezhizao/project/business/taksStockLot/controller/BizTaksStockLotController.java

@@ -6,6 +6,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 
+import cn.ezhizao.common.utils.SecurityUtils;
 import cn.ezhizao.common.utils.poi.ExcelUtil;
 import cn.ezhizao.framework.aspectj.lang.annotation.Log;
 import cn.ezhizao.framework.aspectj.lang.enums.BusinessType;
@@ -93,8 +94,11 @@ public class BizTaksStockLotController extends BaseController
             return error("该载具绑定的批次未在此次盘点内！");
         }
         List<BizTaksStockLot> list = taksStockLotsList.stream()
-                .filter(item -> needQueryDayworkIds.contains(item.getDayworkId()))
+                .filter(item -> needQueryDayworkIds.contains(item.getDayworkId()) && item.getIsWaste() == 0)
                 .collect(Collectors.toList());
+        if(list.isEmpty()) {
+            return error("该载具绑定的批次已批废");
+        }
         return success(list);
     }
 
@@ -141,10 +145,15 @@ public class BizTaksStockLotController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody List<BizTaksStockLot> bizTaksStockLot) throws NoSuchFieldException, IllegalAccessException
     {
-        bizTaksStockLot.forEach(item -> {
+        List<BizTaksStockLot> collect = bizTaksStockLot.stream().filter(item -> item.getFlag() != false).collect(Collectors.toList());
+        collect.forEach(item -> {
             item.setIsTaksStock(1);
+            item.setFirstUpdateId(SecurityUtils.getLoginUser().getUserId());
         });
-        return toAjax(bizTaksStockLotService.updateBatchById(bizTaksStockLot));
+        if(!collect.isEmpty()) {
+            return toAjax(bizTaksStockLotService.updateBatchById(collect));
+        }
+        return success();
     }
 
     /**

src/main/java/cn/ezhizao/project/business/taksStockLot/domain/BizTaksStockLot.java

@@ -117,5 +117,10 @@ public class BizTaksStockLot extends BaseEntity
     @TableField(exist = false)
     private String carrierCode;
     private String processAlias;
+    private Long firstUpdateId;
+    @TableField(exist = false)
+    private Boolean flag;
+    private Integer isWaste;
+    private Long fromId;
 
 }

src/main/resources/mybatis/business/product/BizDayworkItemMapper.xml

@@ -297,6 +297,7 @@
             <if test="processId != null and processId != ''">AND process_id = #{processId}</if>
             <if test="technologicalProcessDetailId != null and technologicalProcessDetailId != ''">AND technological_process_detail_id = #{technologicalProcessDetailId}</if>
             <if test="status != null and status != ''">AND status = #{status}</if>
+            <if test="turnoverType != null">AND turnover_type != #{turnoverType}</if>
             <if test="userStatus != null and userStatus != ''">AND `status` &lt; 5</if>
             <if test="userId !=null and userId != ''">AND user_id = #{userId}</if>
             <if test="tenantId != null  and tenantId != 0">AND tenant_id = #{tenantId}</if>

src/main/resources/mybatis/business/product/BizDayworkMapper.xml

@@ -159,7 +159,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         select sum(lot_number) from biz_production_plan_detail_sub_detail where deleted = 0 and production_plan_detail_id=#{productionPlanDetailId}
     </select>
     <select id="getdayworkNum" resultType = "java.lang.Integer">
-        select sum(1) from biz_daywork t1 left join biz_lot t2 on t1.lot_id = t2.id where t1.deleted = 0 and t1.production_plan_detail_id=#{productionPlanDetailId} and t1.is_waste_recycling = 0 and t2.from_id = 0
+        select sum(1) from biz_daywork t1 left join biz_lot t2 on t1.lot_id = t2.id where t1.deleted = 0 and t1.production_plan_detail_id=#{productionPlanDetailId} and t1.is_waste_recycling = 0 and t2.from_id = 0 and t2.is_superaddition = 0
     </select>
     <select id="getPrevProcess" resultMap="BizProcessResult">
         select * from biz_process where deleted = 0 and id =(select process_id from biz_daywork_item where deleted = 0 and daywork_id = #{dayworkId} and status > 4 order by biz_daywork_item.create_time DESC limit 0,1)

src/main/resources/mybatis/business/taksStockLot/BizTaksStockLotMapper.xml

@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         from biz_taks_stock_lot t1
         <trim prefix=" WHERE" suffix="" suffixOverrides="AND">
             t1.deleted = 0 and t1.dept_id = #{deptId} and t1.take_stock_period_id = #{takeStockPeriodId} and t1.daywork_id != 0
+            and t1.is_waste = 0 and t1.status &lt;2
             <if test="keywords != null  and keywords != ''"> AND t1.lot_code LIKE CONCAT('%',#{keywords},'%')
 <!--                OR-->
 <!--                t1.daywork_id in (select daywork_id from-->