Merge branches 'ext-dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into ext-dev

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/CosmaDefectModel.java

@@ -29,15 +29,12 @@ public class CosmaDefectModel {
     @ApiParam("过程条码")
     private String serialNumber;
 
-    @ApiParam("缺陷代码集合")
-    private List<String> defectCodeList;
+    @ApiParam("缺陷代码")
+    private String defectCode;
 
     @ApiParam("缺陷位置")
     private String location;
 
     @ApiParam("操作人")
     private String userName;
-
-    @ApiParam("报废原因")
-    private String scrapCode;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -236,7 +236,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getCostCenter(), "costCenter", packBean);
         DdlPreparedPack.getStringLikerPack(wmsDocMovementMaster.getThirdRemake(), "thirdRemake", packBean);
-        DdlPreparedPack.getNumEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementMaster.getVendorNo(), "vendorNo", packBean);
 
         getStringBuilderPack(wmsDocMovementMaster, packBean);
 
@@ -484,6 +484,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorDesc(), "vendorDesc", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorAddr(), "vendorAddr", result);
         DdlPreparedPack.getStringLikerPack(basVendor.getVendorEmail(), "vendorEmail", result);
+        DdlPreparedPack.getStringLikerPack(basVendor.getUserName(), "userName", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getIsAsn(), "isAsn", result);
         DdlPreparedPack.getNumEqualPack(basVendor.getVendorType(), "vendorType", result);