add:获取当前子卷最新的子卷信息

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

@@ -26,6 +26,7 @@ import org.nl.common.domain.query.PageQuery;
 import org.nl.common.enums.PackageInfoIvtEnum;
 import org.nl.common.utils.SecurityUtils;
 import org.nl.modules.common.exception.BadRequestException;
+import org.nl.wms.ext.mes.service.LmsToMesService;
 import org.nl.wms.sch.manage.TaskStatusEnum;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
@@ -63,6 +64,9 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
     @Resource
     private IpdmBiSubpackagerelationService subpackagerelationService;
 
+    @Resource
+    private LmsToMesService lmsToMesService;
+
     @Resource
     private IPdmBiContainerinfoService iPdmBiContainerinfoService;
     /**
@@ -143,6 +147,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return result;
     }
 
+    @Override
+    public List<BstIvtPackageinfoivt> getBstIvtPackageinfoivts(String ivtType, String ivtStatus, String sortType, boolean isQueryGroup) {
+        return null;
+    }
+
     /**
      * 根据取放货类型二次分配新的点位
      *
@@ -807,6 +816,8 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         //"空","0","空载具","1","有子卷","2","合格品","3","管制品","4"
         List<BstIvtPackageinfoivt> dtoList;
         UpdateWrapper<BstIvtPackageinfoivt> updateWrapper = new UpdateWrapper<>();
+        //LMS获取MES称重后子卷信息
+        JSONObject jo =new JSONObject();
         //子卷质检合格品和管制品
         if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isBlank(whereJson.getString("pointCode"))) {
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("空")) || whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("空载具")) || whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("有子卷"))) {
@@ -831,7 +842,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
                 return result;
             }
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
+                //子卷下料信息MES传递给LMS
                 iPdmBiContainerinfoService.createSubInfoByContainer(whereJson.getString("container_name"));
+                jo.put("container_name",whereJson.getString("container_name"));
+                lmsToMesService.getInspectionResult(jo);
             }
             updateWrapper.set("container_name", dtoList.get(0).getContainer_name());
             updateWrapper.set("ivt_status", whereJson.getString("ivt_status"));
@@ -840,7 +854,10 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         else if (StringUtils.isNotBlank(whereJson.getString("container_name")) && StringUtils.isNotBlank(whereJson.getString("pointCode"))) {
             dtoList = bstIvtPackageinfoivtMapper.selectList(new LambdaQueryWrapper<BstIvtPackageinfoivt>().eq(BstIvtPackageinfoivt::getPoint_code, whereJson.getString("pointCode").equals("1") ? "ZXQ_135" : "ZXQ_136"));
             if (whereJson.getString("ivt_status").equals(PackageInfoIvtEnum.IVT_STATUS.code("合格品"))) {
+                //子卷下料信息MES传递给LMS
                 iPdmBiContainerinfoService.createSubInfoByContainer(whereJson.getString("container_name"));
+                jo.put("container_name",whereJson.getString("container_name"));
+                lmsToMesService.getInspectionResult(jo);
                 updateWrapper.set("container_name", whereJson.getString("container_name"));
                 updateWrapper.set("ivt_status", PackageInfoIvtEnum.IVT_STATUS.code("合格品"));
             } else {
@@ -874,6 +891,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl<BstIvtPackagein
         return result;
     }
 
+    @Override
+    public String getDjqShiftingPoint(BstIvtPackageinfoivt shallowIvt, boolean isDjqShifting) {
+        return null;
+    }
+
 
     /**
      * 多选删除