Merge remote-tracking branch 'origin/master'

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

@@ -226,7 +226,7 @@ public class BizProcessInspecionController extends BaseController {
         return success(processInspecion);
     }
 
-    @PostMapping("/selectOutsourcedInspecion")
+//    @PostMapping("/selectOutsourcedInspecion")
     public AjaxResult selectOutsourcedInspecion(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
         List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
         List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
@@ -268,7 +268,7 @@ public class BizProcessInspecionController extends BaseController {
         return success(processInspecion);
     }
 
-//    @PostMapping("/selectOutsourcedInspecion")
+    @PostMapping("/selectOutsourcedInspecion")
     public AjaxResult selectOutsourcedInspecionV1(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
         List<BizDayworkItemConsult> itemConsults = bizDayworkItemConsultService.query().eq("process_inspection_id", processInspecion.getId()).eq("is_outsourced_inspection", 1).list();
         List<BizDayworkItemReject> itemRejects = bizDayworkItemRejectService.query().eq("process_inspection_id", processInspecion.getId()).list();
@@ -327,6 +327,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setCarrierId(processInspecion.getLot().getCarrierId());
         processInspecion.setCarrierCode(processInspecion.getLot().getCarrierCode());
         processInspecion.setDayworkId(daywork.getId());
+        processInspecion.setIsOutsourcedInspection(1);
         processInspecion.setProductionPlanId(daywork.getProductionPlanId());
         processInspecion.setDayworkItemId(dayworkItem.getId());
         processInspecion.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
@@ -602,7 +603,7 @@ public class BizProcessInspecionController extends BaseController {
     }
 
     @Transactional
-//    @PostMapping("/saveOutsourcedInspecion")
+    @PostMapping("/saveOutsourcedInspecion")
     public AjaxResult saveOutsourcedInspectionV3(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
 //        // 判断是否已有未确认外协检查
 //        if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {
@@ -658,6 +659,7 @@ public class BizProcessInspecionController extends BaseController {
         processInspecion.setDayworkItemId(dayworkItem.getId());
         processInspecion.setProductionPlanDetailId(daywork.getProductionPlanDetailId());
         processInspecion.setProductionPlanDetailSubDetailId(daywork.getProductionPlanDetailSubDetailId());
+        processInspecion.setIsOutsourcedInspection(1);
         processInspecion.setProductDescription(processInspecion.getLot().getProductDescription());
         processInspecion.setLotId(processInspecion.getLot().getId());
         processInspecion.setLotCode(processInspecion.getLot().getLotCode());
@@ -782,7 +784,7 @@ public class BizProcessInspecionController extends BaseController {
 
 
     @Transactional
-    @PostMapping("/saveOutsourcedInspecion")
+//    @PostMapping("/saveOutsourcedInspecion")
     public AjaxResult saveOutsourcedInspectionV2(@RequestBody BizProcessInspecion processInspecion) throws NoSuchFieldException, IllegalAccessException {
 //        // 判断是否已有未确认外协检查
 //        if (bizProcessInspecionService.query().eq("outsource_order_detail_id", processInspecion.getOutsourceOrderDetailId()).eq("status", 0).count() > 0) {

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

@@ -48,10 +48,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="endTimeString != null and endTimeString!='' ">AND t1.start_time &lt;= #{endTimeString}</if>
             <if test="type != null  ">AND t1.type = #{type}</if>
             <if test="status != null ">AND t1.status = #{status}</if>
-            <if test="keyword != null  and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code
-                LIKE CONCAT('%',#{keyword},'%') OR
-                t1.product_description LIKE CONCAT('%',#{keyword},'%'))
+            <if test="keyword != null  and keyword != '' ">AND (t1.lot_code LIKE CONCAT('%',#{keyword},'%') OR carrier_code LIKE CONCAT('%',#{keyword},'%') OR
+            t1.product_description LIKE CONCAT('%',#{keyword},'%'))
             </if>
+            <if test="isAuto != null  ">AND t1.is_auto = #{isAuto}</if>
+
         </trim>
         order by ( case when t1.status = 0 then 3 else t1.status end) desc, t1.create_time asc
     </select>
@@ -63,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND return_receipt_detail_id !=0
             <if test="lotCode != null  and lotCode != ''">AND lot_code = #{lotCode}</if>
             <if test="userId != null  ">AND user_id = #{userId}</if>
+            <if test="isAuto != null  ">AND is_auto = #{isAuto}</if>
             <if test="startTimeString != null and startTimeString!=''">AND start_time &gt;= #{startTimeString}</if>
             <if test="endTimeString != null and endTimeString!='' ">AND start_time &lt;= #{endTimeString}</if>
             <if test="status != null ">AND status = #{status}</if>