Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/inspection/service/impl/QualifiedStorageServiceImpl.java

@@ -446,7 +446,7 @@ public class QualifiedStorageServiceImpl implements QualifiedStorageService {
             updateExistingStockForInspection(site, warehouseId, partNo, batchNo, locationId, wdr, transQty,engChgLevel);
         } else {
             // 库存不存在，创建新库存记录
-            createNewStockForInspection(site, warehouseId, partNo, batchNo, locationId, wdr, transQty, firstHu,uom);
+            createNewStockForInspection(site, warehouseId, partNo, batchNo, locationId, wdr, transQty, firstHu,uom,engChgLevel);
         }
     }
 
@@ -470,7 +470,7 @@ public class QualifiedStorageServiceImpl implements QualifiedStorageService {
      */
     private void createNewStockForInspection(String site, String warehouseId, String partNo,
                                              String batchNo, String locationId, String wdr,
-                                             BigDecimal transQty, HandlingUnit firstHu,String uom) {
+                                             BigDecimal transQty, HandlingUnit firstHu,String uom,String engChgLevel) {
         InventoryStock newStock = new InventoryStock();
         newStock.setSite(site);
         newStock.setWarehouseId(warehouseId);
@@ -498,6 +498,7 @@ public class QualifiedStorageServiceImpl implements QualifiedStorageService {
         newStock.setLength(firstHu.getLength());
         newStock.setWidth(firstHu.getWidth());
         newStock.setUmId(uom);
+        newStock.setEngChgLevel(engChgLevel!=null?engChgLevel:"1");
 
         // 检验入库一般不设置HandlingUnitQty