解决代码冲突

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/controller/base/MesCutLengthModifyTypeController.java

@@ -1,11 +1,8 @@
 package cn.estsh.i3plus.ext.mes.pcn.apiservice.controller.base;
 
 import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesCutLengthModifyTypeService;
-import cn.estsh.i3plus.ext.mes.pcn.api.base.IMesPartService;
 import cn.estsh.i3plus.ext.mes.pcn.pojo.constant.MesCommonConstant;
-import cn.estsh.i3plus.pojo.base.common.Pager;
 import cn.estsh.i3plus.pojo.mes.bean.MesCutLengthModifyType;
-import cn.estsh.i3plus.pojo.mes.bean.MesPart;
 import cn.estsh.impp.framework.boot.exception.ImppBusiException;
 import cn.estsh.impp.framework.boot.exception.ImppExceptionBuilder;
 import cn.estsh.impp.framework.boot.util.ResultBean;

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

@@ -416,6 +416,8 @@ public class MesPcnExtConstWords {
 
     //发运解析条码最大长度
     public static final String MAX_SHIPPING_BARCODE_LENGTH = "MAX_SHIPPING_BARCODE_LENGTH";
+    //拆解目标库位
+    public static final String DISASSEMBLY_DEST_LOCATE = "DISASSEMBLY_DEST_LOCATE";
     //裁片工单号
     public static final String CUT_WORK_ORDER_NO = "cutWorkOrderNo";
     // 条码