1.物料日志增加DC/LOT

src/main/java/com/neotel/smfcore/core/device/handler/impl/BaseDeviceHandler.java

@@ -637,6 +637,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
             dataCache.updateInventory(storagePos, barcode);
             dataCache.updateInventory(storagePos, barcode);
             //记录日志,完成 task
             //记录日志,完成 task
             task.setBatchInfo(barcode.getBatch());
             task.setBatchInfo(barcode.getBatch());
+            task.setDateCode(barcode.getDateCode());
             task.setNum(barcode.getAmount());
             task.setNum(barcode.getAmount());
         }
         }
         //更新缓存中的库存信息
         //更新缓存中的库存信息
@@ -679,6 +680,7 @@ public class BaseDeviceHandler implements IDeviceHandler {
             barcode.setPosName("");
             barcode.setPosName("");
             barcodeManager.save(barcode);
             barcodeManager.save(barcode);
             task.setBatchInfo(barcode.getBatch());
             task.setBatchInfo(barcode.getBatch());
+            task.setDateCode(barcode.getDateCode());
 
 
             //记录在库时长
             //记录在库时长
             task.setInStoreTime(barcode.getInStoreMiniute());
             task.setInStoreTime(barcode.getInStoreMiniute());

src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java

@@ -113,6 +113,11 @@ public class TaskDto implements Serializable {
     private String operator;
     private String operator;
 
 
     /**
     /**
+     * DC
+     */
+    private String dateCode;
+
+    /**
      * 关联条码,夹具时关联相关的物料,用于入库完成时插入相关物料
      * 关联条码,夹具时关联相关的物料,用于入库完成时插入相关物料
      */
      */
     private List<String> relationCodes;
     private List<String> relationCodes;

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -1139,7 +1139,8 @@ public class TaskService {
             String specifiedBatchId = barcode.getLockId();
             String specifiedBatchId = barcode.getLockId();
             if (!Strings.isNullOrEmpty(specifiedBatchId)) {
             if (!Strings.isNullOrEmpty(specifiedBatchId)) {
                 task.setBatchId(specifiedBatchId);
                 task.setBatchId(specifiedBatchId);
-                task.setBatchInfo(barcode.getLockName());
+                task.setBatchInfo(barcode.getBatch());
+                task.setDateCode(barcode.getDateCode());
             }
             }
         }
         }
 
 

src/main/java/com/neotel/smfcore/custom/lizhen/innerBox/rest/BarcodeExpController.java

@@ -106,6 +106,7 @@ public class BarcodeExpController {
             dataCache.updateInventory(storagePos, barcode);
             dataCache.updateInventory(storagePos, barcode);
             //记录日志,完成 task
             //记录日志,完成 task
             task.setBatchInfo(barcode.getBatch());
             task.setBatchInfo(barcode.getBatch());
+            task.setDateCode(barcode.getDateCode());
             task.setNum(barcode.getAmount());
             task.setNum(barcode.getAmount());
         }
         }
         //更新缓存中的库存信息
         //更新缓存中的库存信息