库存报表中格口未更新

src/main/java/com/neotel/smfcore/core/device/util/DataCache.java

@@ -614,7 +614,7 @@ public class DataCache {
             if(ObjectUtil.isEmpty(wcode)){
                 wcode="";
             }
-            log.info("updateInventoryAmount : cid="+cid+",pn="+partNumber+",amount="+amount+",pn="+pn);
+            log.info("updateInventoryAmount : cid="+cid+",pn="+partNumber+",amount="+amount+",pn="+pn+",wcode="+wcode);
             InventoryItem inventoryItem = getStorageInventoryByPartNumber(cid,partNumber);
             if(inventoryItem == null){
                 inventoryItem = new InventoryItem();
@@ -636,7 +636,7 @@ public class DataCache {
      * @param amount
      * @return
      */
-    public int updateInAmount(String cid,String partNumber,int amount,String pn,String wcode){
+    public int updateInAmount(String cid,String partNumber,int amount,String pn,String wcode,String gekou){
         if(amount != 0){
             if(ObjectUtil.isEmpty(pn)){
                 pn="";
@@ -644,13 +644,15 @@ public class DataCache {
             if(ObjectUtil.isEmpty(wcode)){
                 wcode="";
             }
-            log.info("updateInAmount,直接更改库存="+amount+"，不需要计算 : cid="+cid+",pn="+partNumber+",amount="+amount+",pn="+pn);
+            log.info("updateInAmount,直接更改库存="+amount+"，不需要计算 : cid="+cid+",pn="+partNumber+",amount="+amount+",pn="+pn+",wcode="+wcode+",gekou="+gekou);
             InventoryItem inventoryItem = getStorageInventoryByPartNumber(cid,partNumber);
             if(inventoryItem == null){
                 inventoryItem = new InventoryItem();
                 inventoryItem.setPartNumber(partNumber);
                 inventoryItem.setWareHouseCode(wcode);
                 inventoryItem.setPartname(pn);
+                inventoryItem.setGekouName(gekou);
+
             }
             inventoryItem.setStockCount(amount);
             inventoryItem.setStockReel(1);

src/main/java/com/neotel/smfcore/custom/luxsan_sp/controller/SpAgvDeviceClientController.java

@@ -412,7 +412,7 @@ public class SpAgvDeviceClientController {
                 for (Barcode subCode : subCodes) {
                     subCode.setStorageId(storage.getId());
                     barcodeManager.save(subCode);
-                    dataCache.updateInAmount(storage.getCid(), subCode.getPartNumber(), subCode.getAmount(),subCode.getPn(),storagePos.getWareHouseCode());
+                    dataCache.updateInAmount(storage.getCid(), subCode.getPartNumber(), subCode.getAmount(),subCode.getPn(),storagePos.getWareHouseCode(),subCode.getBarcode());
                 }
             }
             barcode.setSubCodeList(subCodes);
@@ -473,7 +473,7 @@ public class SpAgvDeviceClientController {
         if (subCodes != null && !subCodes.isEmpty()) {
             Storage storage = dataCache.getStorageById(storagePos.getStorageId());
             for (Barcode subCode : subCodes) {
-                dataCache.updateInAmount(storage.getCid(), subCode.getPartNumber(), subCode.getAmount(),subCode.getPn(),storagePos.getWareHouseCode());
+                dataCache.updateInAmount(storage.getCid(), subCode.getPartNumber(), subCode.getAmount(),subCode.getPn(),storagePos.getWareHouseCode(),subCode.getBarcode());
             }
         }
     }