解决代码冲突

modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/serviceimpl/base/MesPullingOrderInfoService.java

@@ -83,7 +83,7 @@ public class MesPullingOrderInfoService extends BaseMesService<MesPullingOrderIn
         DdlPreparedPack.getStringEqualPack(pullingGroupCode, "pullCode", partPackBean);
         partPackBean.setWhereAppend(partPackBean.getWhereAppend() + "  order by modifyDatetime desc");
 
-        List<MesPullingOrderInfo> byHqlWhere = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
+        //List<MesPullingOrderInfo> byHqlWhere = mesPullingOrderPartInfoRepository.findByHqlWhere(partPackBean);
 
         resultMap.put("",mesPullingOrder);
         resultMap.put("success", true);

modules/i3plus-ext-mes-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pojo/util/MesExtConstWords.java

@@ -250,7 +250,11 @@ public class MesExtConstWords {
     public static final String CUT_CODE = "cutCode";
     // 裁片名称
     public static final String CUT_NAME = "cutName";
+    //拆解目标库位
+    public static final String DISASSEMBLY_DEST_LOCATE = "DISASSEMBLY_DEST_LOCATE";
     // 裁片工单号
     public static final String CUT_WORK_ORDER_NO_FUL = "CUT_WORK_ORDER_NO";
+    // 条码
+    public static final String SN = "sn";
 
 }