二维码，新增盘盈入库明细，和 生成来源字段

src/main/java/com/jeeplus/modules/warehouse/profitwarehousing/service/ProfitWarehousingService.java

@@ -93,6 +93,8 @@ public class ProfitWarehousingService extends CrudService<ProfitWarehousingMappe
 		goodsInfo.setModel(profitWarehousingInfo.getMarking());
 		String numSeq = CodeUtil.code("WZBM", StaticNumSeq.WZBM);
 		QrCode qrCode = new QrCode();
+		qrCode.setProfitWarehousingInfo(profitWarehousingInfo);
+		qrCode.setComeFlag("1");
 		qrCode.setCode(numSeq);
 		qrCode.setState("0");
 		qrCode.setGoodsInfo(goodsInfo);

src/main/java/com/jeeplus/modules/warehouse/qrcode/entity/QrCode.java

@@ -7,6 +7,7 @@ package com.jeeplus.modules.warehouse.qrcode.entity;
 import com.jeeplus.core.persistence.DataEntity;
 import com.jeeplus.common.utils.excel.annotation.ExcelField;
 import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo;
+import com.jeeplus.modules.warehouse.profitwarehousing.entity.ProfitWarehousingInfo;
 
 import java.util.List;
 
@@ -22,6 +23,24 @@ public class QrCode extends DataEntity<QrCode> {
 	private String code;		// 物资编码
 	private String url;		// 二维码存储路径
 	private String state; // 物资状态码 (0：未入库，1：已入库未入账，2：已入账未下账，3：下账)
+	private ProfitWarehousingInfo profitWarehousingInfo;		// 盘盈入库明细外键
+	private String comeFlag;		// 二维码生成来源，（0 货品 ， 1 盘盈入库）
+
+	public ProfitWarehousingInfo getProfitWarehousingInfo() {
+		return profitWarehousingInfo;
+	}
+
+	public void setProfitWarehousingInfo(ProfitWarehousingInfo profitWarehousingInfo) {
+		this.profitWarehousingInfo = profitWarehousingInfo;
+	}
+
+	public String getComeFlag() {
+		return comeFlag;
+	}
+
+	public void setComeFlag(String comeFlag) {
+		this.comeFlag = comeFlag;
+	}
 
 	public QrCode() {
 		super();

src/main/java/com/jeeplus/modules/warehouse/qrcode/mapper/xml/QrCodeMapper.xml

@@ -5,7 +5,9 @@
 	<sql id="qrCodeColumns">
 		a.id AS "id",
 		a.goods_info_id AS "goodsInfo.id",
+		a.profit_warehousing_info_id AS "profitWarehousingInfo.id",
 		a.code AS "code",
+		a.come_flag AS "comeFlag",
 		a.state AS "state",
 		a.url AS "url",
 		a.create_by AS "createBy.id",
@@ -19,17 +21,32 @@
 		type.code AS "goodsInfo.type.code",
 		type.name AS "goodsInfo.type.name",
 
+		type2.id AS "profitWarehousingInfo.type.id",
+		type2.code AS "profitWarehousingInfo.type.code",
+		type2.name AS "profitWarehousingInfo.type.name",
+
+		pwi.NAME AS "profitWarehousingInfo.name",
+		pwi.marking AS "profitWarehousingInfo.marking",
+		pwi.amount AS "profitWarehousingInfo.amount",
+		pwi.profit_warehousing_id AS "profitWarehousingInfo.profitWarehousing.id",
+		pw.number AS "profitWarehousingInfo.profitWarehousing.number",
+
 		gi.NAME AS "goodsInfo.name",
 		gi.model AS "goodsInfo.model",
 		gi.amount AS "goodsInfo.amount",
 		gi.goods_id AS "goodsInfo.goods.id",
 		g.batch_num AS "goodsInfo.goods.batchNum"
+
+
 	</sql>
 	
 	<sql id="qrCodeJoins">
 		LEFT JOIN t_wh_goods_info gi ON a.goods_info_id = gi.id
+		LEFT JOIN t_wh_profit_warehousing_info pwi ON a.profit_warehousing_info_id = pwi.id
 		LEFT JOIN t_wh_material_type type ON type.id = gi.type_id
+		LEFT JOIN t_wh_material_type type2 ON type2.id = pwi.type
 		LEFT JOIN t_wh_goods g ON g.id = gi.goods_id
+		LEFT JOIN t_wh_profit_warehousing pw ON pwi.profit_warehousing_id = pw.id
 	</sql>
 	
     
@@ -104,6 +121,8 @@
 		INSERT INTO t_wh_qr(
 			id,
 			goods_info_id,
+			profit_warehousing_info_id,
+			come_flag,
 			code,
 			url,
 			state,
@@ -116,6 +135,8 @@
 		) VALUES (
 			#{id},
 			#{goodsInfo.id},
+			#{profitWarehousingInfo.id},
+			#{comeFlag},
 			#{code},
 			#{url},
 			#{state},
@@ -131,6 +152,8 @@
 	<update id="update">
 		UPDATE t_wh_qr SET 	
 			goods_info_id = #{goodsInfo.id},
+			profit_warehousing_info_id = #{profitWarehousingInfo.id},
+			come_flag = #{comeFlag},
 			code = #{code},
 			url = #{url},
 			state = #{state},

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

@@ -3,6 +3,7 @@ package com.jeeplus.modules.warehouse.qrcode.util;
 import com.alibaba.fastjson.JSON;
 import com.jeeplus.common.utils.io.FileUtil;
 import com.jeeplus.modules.warehouse.goods.entity.GoodsInfo;
+import com.jeeplus.modules.warehouse.profitwarehousing.entity.ProfitWarehousingInfo;
 import com.jeeplus.modules.warehouse.qrcode.entity.QrCode;
 
 import java.awt.image.BufferedImage;
@@ -37,8 +38,10 @@ public class BuildQcUtil {
     }
 
     public static void buildQrOne(QrCode qrCode, String qrImgPath, String imgPath) throws IOException {
+        ProfitWarehousingInfo profitWarehousingInfo = qrCode.getProfitWarehousingInfo();
         Map<String, String> map = new HashMap<>();
         map.put("code", qrCode.getId());
+        map.put("infoId", profitWarehousingInfo.getId());
         TwoDimensionCode.encoderQRCode(JSON.toJSONString(map), qrImgPath, "png", 6);
         File file = new File(qrImgPath);
         try {