fix：齐套性检测优化

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/dao/StorgeMapper.java

@@ -49,4 +49,6 @@ public interface StorgeMapper extends SuperMapper<Storge> {
     List<Map>getstorgeByZone(Map map);
 
     void updateLockStatusById(Map updateLockStatusParams);
+
+    List<Storge> findListStorgeByGoodsID(Long goodsId);
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/StorgeService.java

@@ -142,4 +142,6 @@ public interface StorgeService extends SuperCacheService<Storge> {
      */
     boolean cutToolStockHandle(TaskNode taskNode, String cutNo);
 
+    List<Storge> findListStorgeByGoodsID(Long goodsId);
+
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/edgeLibrary/service/impl/StorgeServiceImpl.java

@@ -49,6 +49,7 @@ import com.github.zuihou.utils.BeanPlusUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.compress.utils.Lists;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -742,4 +743,10 @@ public class StorgeServiceImpl extends SuperCacheServiceImpl<StorgeMapper, Storg
 
         return false;
     }
+
+    @Override
+    public List<Storge> findListStorgeByGoodsID(Long goodsId) {
+
+        return baseMapper.findListStorgeByGoodsID(goodsId);
+    }
 }

imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/operationManagementCenter/service/impl/TaskServiceImpl.java

@@ -1615,6 +1615,9 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
     private ZZoneProductionresourceMapper zZoneProductionresourceMapper;
     @Autowired
     private CutterTestDataMapper cutterTestDataMapper;
+
+    @Autowired
+    private CuttingToolMapper cuttingToolMapper;
     @Override
     //刀具上料确认过程
     public R cutterRfidConfirmProcedure(Map<String, Object> map) {
@@ -1630,12 +1633,12 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         }
 
         ZZone zZone = zoneService.getById(Long.parseLong(map.get("zoneId").toString()));
-        String url = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(zZone.getNo() + "_plc").toString());
-        url = url + "/api/findRfidData";
+        String url1 = (null == msgUtil.redis_get(ParameterKey.PARAMETERS)? "": ((Map<String,String>)msgUtil.redis_get(ParameterKey.PARAMETERS)).get(zZone.getNo() + "_plc").toString());
+        String url = url1 + "/api/findRfidData";
 
         //LAUPT 刀具rfid
         JSONObject object = new JSONObject();
-        object.put("Location","LAUPT");
+        object.put("mode","LAUPT");
         JSONObject rfidObj = new JSONObject();
         rfidObj.put("url", productionresource.getIp());
         rfidObj.put("port", productionresource.getPort());
@@ -1669,6 +1672,23 @@ public class TaskServiceImpl extends SuperServiceImpl<TTaskMapper, TTask> implem
         if(Objects.isNull(cutterTestData)){
             return R.fail("此刀具未经过对刀仪检测,刀柄号："+par1);
         }
+        CuttingTool cuttingTool = cuttingToolMapper.selectOne(Wraps.<CuttingTool>lbQ().eq(CuttingTool::getCuttingToolNo, Long.parseLong(par1)));
+        if(Objects.isNull(cuttingTool)){
+            return R.fail("缺失基础刀具信息,刀柄号："+par1);
+        }
+
+        // 数据复位
+        if(imcsTOccsEnable){
+            url = url1 + "/api/rfidReset";
+            restTemplate.postForObject(url, formEntity, String.class);
+        }
+
+        // 刀具校验，确认在库位中没有此刀具
+        List<Storge> listStorgeByGoodsID = storgeService.findListStorgeByGoodsID(cuttingTool.getId());
+        if(!listStorgeByGoodsID.isEmpty()){
+            return R.fail("此刀具已存在："+listStorgeByGoodsID.get(0).getName());
+        }
+
 
         Map data = new HashMap();
         data.put("rfidCutterT",  cutterTestData.getCutterT());

imcs-admin-boot/imcs-business-biz/src/main/resources/mapper_business/base/edgeLibrary/StorgeMapper.xml

@@ -117,4 +117,14 @@
         UPDATE imcs_s_storge SET lock_status = '1', camp_id = null WHERE lock_status = '0' and (id = #{agvStartStorgeId} or id = #{agvEndStorgeId});
     </update>
 
+    <select id="findListStorgeByGoodsID" parameterType="Long" resultType="com.github.zuihou.business.edgeLibrary.entity.Storge" >
+        SELECT
+            s.*
+        FROM
+            imcs_s_stock_info m
+            LEFT JOIN imcs_s_storge s ON m.storge_id = s.id
+        WHERE
+            goods_id = #{goodsId}
+    </select>
+
 </mapper>

imcs-admin-boot/imcs-business-controller/src/main/java/com/github/zuihou/business/controller/productionResourceCenter/StationUserController.java

@@ -218,7 +218,7 @@ public class StationUserController extends SuperController<StationUserService, L
         Map<Object, List<CutterTestDataEntity>> listMap = infos.stream().collect(Collectors.groupingBy(CutterTestDataEntity::getResourceId));
 
         cutToolList.forEach(item -> {
-            item.setSiteStatus("1");
+            item.setSiteStatus(null);
             if (listMap.isEmpty() || listMap.get(item.getId()) == null) {
                 return;
             }
@@ -226,13 +226,7 @@ public class StationUserController extends SuperController<StationUserService, L
             if(cutterTestDataEntities.get(0).getStatus() == null ){
                 return;
             }
-            if (cutterTestDataEntities.get(0).getStatus() == 2) {
-                item.setSiteStatus("2");
-            } else if (cutterTestDataEntities.get(0).getStatus() == 3) {
-                item.setSiteStatus("3");
-            }else {
-                item.setSiteStatus("1");
-            }
+            item.setSiteStatus(cutterTestDataEntities.get(0).getStatus().toString());
         });
 
 

imcs-admin-boot/imcs-business-entity/src/main/java/com/github/zuihou/business/productionResourceCenter/entity/Productionresource.java

@@ -332,7 +332,7 @@ public class Productionresource extends Entity<Long> {
     private String toolManagementId;
 
     @TableField(exist=false)
-    @ApiModelProperty(value = "站点装填，1 无数据，2需要上料，3需要下料")
+    @ApiModelProperty(value = "站点状态 -来源test-data表")
     private String siteStatus;
 
     @Builder