台账表修改货架、仓库字段

src/main/java/com/jeeplus/modules/warehouse/ledger/entity/LedgerInfo.java

@@ -10,8 +10,10 @@ import com.jeeplus.modules.warehouse.shelves.entity.Shelves;
 
 import com.jeeplus.core.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
+import com.jeeplus.modules.warehouse.warehouse.entity.Warehouse;
 
 import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * 台账明细Entity
@@ -28,9 +30,16 @@ public class LedgerInfo extends DataEntity<LedgerInfo> {
 	private Ledger ledger;		// 主表外键 父类
 	private GoodsInfo goodsInfo;		// 货品明细
 	private QrCode qr;		// 二维码id
-	private Shelves shelves;		// 货架id
+
 	private String code;		// 物资编码
 	private BigDecimal amount; // 单价
+	private int num; // 数量
+
+	private String shelvesIds;
+	private String warehouseIds;
+
+	private List<Shelves> shelvesList;
+	private List<Warehouse> warehouseList;
 
 	public LedgerInfo() {
 		super();
@@ -105,14 +114,6 @@ public class LedgerInfo extends DataEntity<LedgerInfo> {
 		this.qr = qr;
 	}
 
-	@ExcelField(title="货架id", fieldType=Shelves.class, value="shelves.name", align=2, sort=8)
-	public Shelves getShelves() {
-		return shelves;
-	}
-
-	public void setShelves(Shelves shelves) {
-		this.shelves = shelves;
-	}
 	
 	@ExcelField(title="物资编码", align=2, sort=9)
 	public String getCode() {
@@ -131,4 +132,44 @@ public class LedgerInfo extends DataEntity<LedgerInfo> {
 	public void setAmount(BigDecimal amount) {
 		this.amount = amount;
 	}
+
+	public int getNum() {
+		return num;
+	}
+
+	public void setNum(int num) {
+		this.num = num;
+	}
+
+	public String getShelvesIds() {
+		return shelvesIds;
+	}
+
+	public void setShelvesIds(String shelvesIds) {
+		this.shelvesIds = shelvesIds;
+	}
+
+	public String getWarehouseIds() {
+		return warehouseIds;
+	}
+
+	public void setWarehouseIds(String warehouseIds) {
+		this.warehouseIds = warehouseIds;
+	}
+
+	public List<Shelves> getShelvesList() {
+		return shelvesList;
+	}
+
+	public void setShelvesList(List<Shelves> shelvesList) {
+		this.shelvesList = shelvesList;
+	}
+
+	public List<Warehouse> getWarehouseList() {
+		return warehouseList;
+	}
+
+	public void setWarehouseList(List<Warehouse> warehouseList) {
+		this.warehouseList = warehouseList;
+	}
 }
\ No newline at end of file

src/main/java/com/jeeplus/modules/warehouse/ledger/mapper/xml/LedgerInfoMapper.xml

@@ -11,9 +11,11 @@
 		a.ledger_id AS "ledger.id",
 		a.goods_info_id AS "goodsInfo.id",
 		a.qr_id AS "qr.id",
-		a.shelves_id AS "shelves.id",
+		a.shelves_ids AS "shelvesIds",
+		a.warehouse_ids AS "warehouseIds",
 		a.code AS "code",
 		a.amount AS "amount",
+		a.num AS "num",
 		a.create_by AS "createBy.id",
 		a.create_date AS "createDate",
 		a.update_by AS "updateBy.id",
@@ -24,13 +26,11 @@
 				
 		type.code AS "type.code",
 		type.name AS "type.name",
+		type.amount AS "type.amount",
+		type.unit AS "type.unit",
 
 
 
-				
-				
-				
-		shelves.name AS "shelves.name",
 		qr.url AS "qr.url"
 
 	</sql>
@@ -39,7 +39,6 @@
 		
 		LEFT JOIN t_wh_material_type type ON type.id = a.type_id
 		LEFT JOIN t_wh_ledger b ON b.id = a.ledger_id
-		LEFT JOIN t_wh_shelves shelves ON shelves.id = a.shelves_id
 		LEFT JOIN t_wh_qr qr ON a.qr_id = qr.id
 	</sql>
 	
@@ -84,8 +83,11 @@
 			<if test="ledger != null and ledger.id != null and ledger.id != ''">
 				AND a.ledger_id = #{ledger.id}
 			</if>
-			<if test="shelves != null and shelves.id != null and shelves.id != ''">
-				AND a.shelves_id = #{shelves.id}
+			<if test="shelvesIds != null and shelvesIds != ''">
+				AND a.shelves_ids LIKE
+				<if test="dbName == 'oracle'">'%'||#{shelvesIds}||'%'</if>
+				<if test="dbName == 'mssql'">'%'+#{shelvesIds}+'%'</if>
+				<if test="dbName == 'mysql'">concat('%',#{shelvesIds},'%')</if>
 			</if>
 			<if test="code != null and code != ''">
 				AND a.code LIKE 
@@ -136,9 +138,11 @@
 			ledger_id,
 			goods_info_id,
 			qr_id,
-			shelves_id,
+			shelves_ids,
+			warehouse_ids,
 			code,
 			amount,
+			num,
 			create_by,
 			create_date,
 			update_by,
@@ -154,9 +158,11 @@
 			#{ledger.id},
 			#{goodsInfo.id},
 			#{qr.id},
-			#{shelves.id},
+			#{shelvesIds},
+			#{warehouseIds},
 			#{code},
 			#{amount},
+			#{num},
 			#{createBy.id},
 			#{createDate},
 			#{updateBy.id},
@@ -175,7 +181,8 @@
 			ledger_id = #{ledger.id},
 			goods_info_id = #{goodsInfo.id},
 			qr_id = #{qr.id},
-			shelves_id = #{shelves.id},
+			shelves_ids = #{shelvesIds},
+			warehouse_ids = #{warehouseIds},
 			code = #{code},
 			amount = #{amount},
 			update_by = #{updateBy.id},

src/main/java/com/jeeplus/modules/warehouse/qrcode/util/DrawQrcodeUtil.java

@@ -237,6 +237,7 @@ public class DrawQrcodeUtil {
         }
     }
 
+    // D:/jeeplus/userfiles/1/程序附件/image/500107-2023-07-0011.png
     public static BufferedImage createAssetImageNew(File qrcodeFile,QrCode qrCode) throws IOException {
         GoodsInfo goodsInfo = qrCode.getGoodsInfo();
         QRcodeSize qRcodeSize = null;

src/main/java/com/jeeplus/modules/warehouse/storage/mapper/xml/StorageInfoMapper.xml

@@ -9,8 +9,8 @@
 		a.type_id AS "type.id",
 		a.model AS "model",
 		a.goods_info_id AS "goodsInfo.id",
-		a.shelves_id AS "shelvesIds",
-		a.warehouse_id AS "warehouseIds",
+		a.shelves_ids AS "shelvesIds",
+		a.warehouse_ids AS "warehouseIds",
 		a.qr_id AS "qrCode.id",
 		a.remarks AS "remarks",
 		a.create_by AS "createBy.id",
@@ -120,8 +120,8 @@
 			type_id,
 			model,
 			goods_info_id,
-			shelves_id,
-			warehouse_id,
+			shelves_ids,
+			warehouse_ids,
 			qr_id,
 			amount,
 			num,
@@ -159,8 +159,8 @@
 			type_id = #{type.id},
 			model = #{model},
 			goods_info_id = #{goodsInfo.id},
-			shelves_id = #{shelvesIds},
-			warehouse_id = #{warehouseIds},
+			shelves_ids = #{shelvesIds},
+			warehouse_ids = #{warehouseIds},
 			amount = #{amount},
 			num = #{num},
 			remarks = #{remarks},