diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index 0e93187..93b15bb 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@@ -1970,7 +1970,10 @@ public class MesEnumUtil {
         BLIND_CHECK_RULE(510, "blindCheckRuleExcelService", "盲检规则导入"),
         BOARD_PLAN_CAPACITY(520, "boardPlanCapacityExcelService", "计划产能看板导入"),
         MES_PROD_WORK_CENTER(530, "prodWorkCenterExcelService", "产品工作中心配置导入"),
-        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入");
+        MES_PART_COLOR(540, "partColorExcelService", "产品颜色导入"),
+        MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
+        MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"),
+        MES_LOCATION(570, "locationExcelService", "库位信息导入");
 
         private int value;
         private String service;
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 37ae66f..5e2a4b1 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -857,7 +857,8 @@ public class WmsEnumUtil {
         CUSTOMER_RETURN_SCRAP(660, "CUSTOMER_RETURN_SCRAP", "客户退货报废"),
         MATERIAL_SCRAP(670, "MATERIAL_SCRAP", "物料报废"),
         PROD_SCRAP(680, "PROD_SCRAP", "生产报废"),
-        OUT_RETURN_SOURCING(690, "PROD_SCRAP", "委外返工发料");
+        OUT_RETURN_SOURCING(690, "OUT_RETURN_SOURCING", "委外返工发料"),
+        OUT_RETURN_RECOVER(700, "OUT_RETURN_RECOVER", "委外返工收回");
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java
index 9ce2fba..581368f 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesLocation.java
@@ -55,7 +55,15 @@ public class MesLocation extends BaseBean implements Serializable {
     @ApiParam("最大存储量")
     private Integer maxQty = 0;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("物料名称")
     private String partNameRdd;
+
+    @Transient
+    @ApiParam("包装编号集合")
+    private String packageNoList;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
index 8d7c019..bd59557 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPart.java
@@ -120,6 +120,10 @@ public class MesPart extends BaseBean implements Serializable {
     @ApiParam("打磨件物料号")
     private String prePartNo;
 
+    @Column(name = "IS_SMALL_SIZE")
+    @ApiParam("是否小尺寸物料")
+    private Integer isSmallSize = 1;
+
     @Transient
     @ApiParam("产品类型名称")
     private String produceCategoryName;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
index 6c41884..98adfc4 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPartStockSchedule.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -65,4 +66,8 @@ public class MesPartStockSchedule extends BaseBean implements Serializable {
     @Column(name = "PROD_CFG_CODE")
     @ApiParam("配置代码")
     private String prodCfgCode;
+
+    @Transient
+    @ApiParam("物料名称")
+    private String partName;
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java
index 8820837..7148de0 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/InjectionFeedingModel.java
@@ -20,6 +20,9 @@ public class InjectionFeedingModel {
     @ApiParam("原材料物料号")
     private String partNo;
 
+    @ApiParam("原材料物料名称")
+    private String partName;
+
     @ApiParam("是否锁定：1=是，2=否")
     private Integer lockFlag;
 
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
index d1220a7..5a21f16 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesEquipmentModel.java
@@ -106,13 +106,14 @@ public class MesEquipmentModel implements Serializable {
     }
 
     //根据条件查询设备所有有效数据-设备作业任务下拉框 queryMesEquipmentListByParams
-    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory) {
+    public MesEquipmentModel(Long id, String equipmentCode, String equipmentName, Integer status, String workCenterCode, String equipmentCategory,
+                             String modifyDatetime) {
         this.id = id;
         this.equipmentCode = equipmentCode;
         this.equipmentName = equipmentName;
         this.status = status;
         this.workCenterCode = workCenterCode;
-        this.equipmentCategory = equipmentCategory;
+        this.modifyDatetime = modifyDatetime;
     }
 
     //根据生产线，工位获取设备集合 findMesEquipmentList
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java
new file mode 100644
index 0000000..ada9108
--- /dev/null
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TorqueHeadChangeModel.java
@@ -0,0 +1,32 @@
+package cn.estsh.i3plus.pojo.mes.model;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author adair.song
+ * @date 2020/6/16 14:21
+ * @desc 枪头更换计数弹框model
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Api("枪头更换计数弹框model")
+public class TorqueHeadChangeModel {
+
+    @ApiParam(name = "确认密码")
+    private String passWord;
+
+    @ApiParam(name = "工厂")
+    private String organizeCode;
+
+    @ApiParam(name = "工作中心")
+    private String workCenterCode;
+
+    @ApiParam(name = "工作单元")
+    private String workCellCode;
+
+}
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
index 0c38eff..4bc9fed 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java
@@ -3267,4 +3267,13 @@ public class MesHqlPack {
         }
         return packBean;
     }
+
+    public static DdlPackBean getMesLocation(MesLocation mesLocation) {
+        DdlPackBean packBean = getAllBaseData(mesLocation.getOrganizeCode());
+        DdlPreparedPack.getStringLikerPack(mesLocation.getPartNo(), "partNo", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationCode(), "locationCode", packBean);
+        DdlPreparedPack.getStringLikerPack(mesLocation.getLocationName(), "locationName", packBean);
+        DdlPreparedPack.getNumEqualPack(mesLocation.getIsValid(), "isValid", packBean);
+        return packBean;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
index 1ca730c..76ab86f 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsActionLogData.java
@@ -1,7 +1,6 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.Api;
@@ -11,7 +10,10 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Lob;
+import javax.persistence.Table;
 
 /**
  * @Description :作业记录参数表
@@ -40,7 +42,10 @@ public class WmsActionLogData extends BaseBean {
     @ApiParam(value = "交易类型编号")
     public String transTypeCode;
 
-    @Transient
+    @Column(name = "ORDER_NO")
+    @ApiParam(value = "业务单号")
+    public String orderNo;
+
     @Column(name = "MOVE_NO")
     @ApiParam(value = "移动单单号")
     public String moveNo;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 28a59c5..7d1d04e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -173,6 +173,10 @@ public class WmsDocMovementSn extends BaseBean {
     private String whNo;
 
     @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
@@ -254,7 +258,20 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String vendorNo,Integer snStatus,Double sumQty) {
+                            String version,String whNo,Integer snStatus,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.version = version;
+        this.whNo = whNo;
+        this.snStatus = snStatus;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -262,6 +279,7 @@ public class WmsDocMovementSn extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.version = version;
         this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
index 67fd34b..df42ed8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@@ -92,6 +92,18 @@ public class WmsTaskInfo extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("是否同步")
+    public Integer syncStatus = 10;
+
+    @Column(name = "SYNC_DATE_TIME")
+    @ApiParam(value = "同步时间", example = "1")
+    public String syncDateTime;
+
+    @Column(name = "SYNC_USER")
+    @ApiParam(value = "同步人", example = "1")
+    public String syncUser;
+
     @Transient
     @ApiParam("计划日期")
     private String zdate;
diff --git a/sonar-project.properties b/sonar-project.properties
index ae014e9..0786d8d 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -6,7 +6,7 @@ sonar.projectKey=i3plus.pojo:i3plus-pojo
 # defaults to project key
 sonar.projectName=i3plus-pojo
 # defaults to 'not provided'
-sonar.projectVersion=1.0-PROD-SNAPSHOT
+sonar.projectVersion=1.0-TEST-SNAPSHOT
  
 # Path is relative to the sonar-project.properties file. Defaults to .
 #sonar.sources=./