出入库日志显示批次和供应商

src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java

@@ -281,6 +281,8 @@ public class SingleInController {
             dataLog.setPartNumber(pn);
             dataLog.setPartNumber(pn);
             dataLog.setType(OP.PUT_IN);
             dataLog.setType(OP.PUT_IN);
             dataLog.setInType(inType);
             dataLog.setInType(inType);
+            dataLog.setProvider(barcode.getProvider());
+            dataLog.setBatchInfo(barcode.getBatch());
             if(inType.equals(5)){
             if(inType.equals(5)){
                 InList inList=inListCache.getInList(docName);
                 InList inList=inListCache.getInList(docName);
                 dataLog.setSourceName(docName);
                 dataLog.setSourceName(docName);

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

@@ -80,6 +80,11 @@ public class TaskDto implements Serializable {
     private String batchInfo;
     private String batchInfo;
 
 
     /**
     /**
+     * 供应商
+     */
+    private String provider;
+
+    /**
      * 指令来源:站位列表 指定订单工单 MES
      * 指令来源:站位列表 指定订单工单 MES
      */
      */
     private String sourceType;
     private String sourceType;

src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java

@@ -31,6 +31,8 @@ public class DataLog extends BasePo implements Serializable {
             setBarcode(barcode.getBarcode());
             setBarcode(barcode.getBarcode());
             setNum(barcode.getAmount());
             setNum(barcode.getAmount());
             setMemo(barcode.getMemo());
             setMemo(barcode.getMemo());
+            setProvider(barcode.getProvider());
+            setBatchInfo(barcode.getBatch());
             setPutInDate(barcode.getPutInDate());
             setPutInDate(barcode.getPutInDate());
 
 
             msdAppendInfo = new MSDAppendInfo();
             msdAppendInfo = new MSDAppendInfo();
@@ -83,6 +85,8 @@ public class DataLog extends BasePo implements Serializable {
 
 
     //二维码(Reel ID)
     //二维码(Reel ID)
     private String barcode = "";
     private String barcode = "";
+    //供应商
+    private String provider;
     /**
     /**
      * 料盘宽度信息
      * 料盘宽度信息
      */
      */