Merge remote-tracking branch 'origin/master_merge' into master_merge

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/dao/mapper/BstIvtPackageinfoivtMapper.xml

@@ -79,6 +79,7 @@
         </if>
         )
         AND (task_status <![CDATA[ < ]]> '07')
+        AND (is_delete = '0')
     </select>
 
 

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java

@@ -401,9 +401,9 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         UpdateWrapper<BstIvtPackageinfoivt> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("point_code", pointCode);
         updateWrapper.setSql("ivt_status = '0', container_name = null");
+        //清空起点库存状态
+        bstIvtPackageinfoivtMapper.update(null, updateWrapper);
         if (isUpDateTask) {
-            //清空起点库存状态
-            bstIvtPackageinfoivtMapper.update(null, updateWrapper);
             //标记桁架任务取空载具完成
             UpdateWrapper<SchBaseTask> updateWrapper1 = new UpdateWrapper<>();
             updateWrapper1.eq("task_id", baseTask.getTask_id());

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/DjqTask.java

@@ -97,14 +97,15 @@ public class DjqTask extends AbstractAcsTask {
         }
         if (StrUtil.equals(status, TaskStatusEnum.FINISHED.getCode())) {
             log.info("任务编号为:" + schBaseTask.getTask_code() + "的任务完成接口在" + schBaseTask.getUpdate_time() + "被调用---------------------------------------------");
-            //1.改变起点点位状态，二次分配，取货完成就改起点库存
+            //1.改变起点点位状态，满轴->待检，二次分配取货完成信号发送就改起点库存
             //packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
             //2.更新库存记录
-            //管制品重新质检
             String ivtStatus;
             if (StringUtils.isNotBlank(schBaseTask.getRequest_param())) {
                 if (schBaseTask.getRequest_param().equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
+                    //管制品重新质检
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("合格品");
+                    packageinfoivtService.update(new UpdateWrapper<BstIvtPackageinfoivt>().set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("空")).set("container_name", null).eq("point_code", schBaseTask.getPoint_code1()));
                 } else {
                     ivtStatus = PackageInfoIvtEnum.IVT_STATUS.code("有子卷");
                 }
@@ -181,6 +182,7 @@ public class DjqTask extends AbstractAcsTask {
                 .point_code4(form.getString("point_code4"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
+                .request_param(form.getString("request_param"))
                 .handle_class(THIS_CLASS)
                 .create_id(SecurityUtils.getCurrentUserId())
                 .create_name(SecurityUtils.getCurrentUsername())

lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/first_floor_area/GzqTask.java

@@ -157,6 +157,7 @@ public class GzqTask extends AbstractAcsTask {
                 .point_code2(pointCode2)
                 .point_code3(form.getString("point_code3"))
                 .point_code4(form.getString("point_code4"))
+                .request_param(form.getString("request_param"))
                 .task_id(org.nl.common.utils.IdUtil.getStringId())
                 .task_code(org.nl.common.utils.IdUtil.getStringId())
                 .handle_class(THIS_CLASS)