From cb1db468bcaa90e9a0e2e4aee192088e9370ac52 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期一, 27 五月 2024 09:19:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs

---
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java |   78 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
index c794049..9c211bd 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Mat.java
@@ -107,7 +107,7 @@
      * 鍗曚綅閲�
      */
     @ApiModelProperty(value= "鍗曚綅閲�")
-    private Double units;
+    private String units;
 
     /**
      * 鏉＄爜
@@ -225,9 +225,83 @@
     @ApiModelProperty(value= "浠撳簱ID")
     private Long hostId;
 
+    //蹇靛垵浣跨敤浠ヤ笅棰濆瀛楁
+    //涓昏浠撳簱
+    private String mainHost;
+
+    //涓昏鏉ユ簮
+    private String mainSource;
+
+    //寰幆鐩樼偣鐮�
+    private String cyclePickCode;
+
+    //瀛樻斁浣嶇疆
+    private String locationStock;
+
+    //鏉愯川
+    private String material;
+
+    //鍒朵护
+    private String decrees;
+
+    //鍥惧彿
+    private String imgNum;
+
+    //閲囪喘鍗曚綅
+    private String purchasingUnits;
+
+    //宸ヨ壓缂栧彿
+    private String processNumber;
+
+    //鎸囧畾bom
+    private String bom;
+
+    //瀹夊叏瀛橀噺
+    private String safeNum;
+
+    //鏈�浣庤ˉ閲�
+    private String miniCount;
+
+    //琛ヨ揣鍊嶉噺
+    private String replenishmentNum;
+
+    //鑷畾涔�1
+    private String tmp1;
+
+    //鑷畾涔�2
+    private String tmp2;
+
+    //鑷畾涔�3
+    private String tmp3;
+
+    //鎸夐渶姹傝ˉ璐�
+    private String restockDemand;
+
+    //澶辨晥
+    private String lapse;
+
+    //蹇嵎鐮�
+    private String shortcuts;
+
+    //瀹藉害
+    private String width;
+
+    //楂樺害
+    private String height;
+
+    //浼氳鍒嗙被
+    private String accountingClass;
+
+    //鎵瑰彿绠＄悊
+    private String batch;
+
+    //瀛樿揣鏍哥畻
+    private String inventoryAccount;
+
+
     public Mat() {}
 
-    public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, Double units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
+    public Mat(String uuid, Long tagId, String matnr, String maktx, String name, String specs, String model, String color, String brand, String unit, Double price, String sku, String units, String barcode, String origin, String manu, String manuDate, String itemNum, Double weight, Double length, Double volume, String threeCode, String supp, String suppCode, String deadTime, Integer status, Long createBy, Date createTime, Long updateBy, Date updateTime, String memo, Long hostId) {
         this.uuid = uuid;
         this.tagId = tagId;
         this.matnr = matnr;

--
Gitblit v1.9.1