Merge branches 'hy', 'master' and 'zlt' of 47.92.228.5:huyi/warehouse into hy

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/entity/MaterialRequisitionInfo.java

@@ -18,7 +18,7 @@ public class MaterialRequisitionInfo extends DataEntity<MaterialRequisitionInfo>
 	
 	private static final long serialVersionUID = 1L;
 	private MaterialRequisition materialRequisition;		// 物资领用主表ID
-	private User receiver;		// 领用人
+	private String receiver;		// 领用人
 	private LedgerInfo ledgerInfo;		// 物资台账明细ID
 	
 	public MaterialRequisitionInfo() {
@@ -47,11 +47,11 @@ public class MaterialRequisitionInfo extends DataEntity<MaterialRequisitionInfo>
 		return ledgerInfo;
 	}
 	@ExcelField(title="领用人", align=2, sort=3)
-	public User getReceiver() {
+	public String getReceiver() {
 		return receiver;
 	}
 
-	public void setReceiver(User receiver) {
+	public void setReceiver(String receiver) {
 		this.receiver = receiver;
 	}
 

src/main/java/com/jeeplus/modules/warehouse/materialrequisition/mapper/xml/MaterialRequisitionInfoMapper.xml

@@ -18,12 +18,10 @@
 		ledgerInfo.model AS "ledgerInfo.model",
 		ledgerInfo.amount AS "ledgerInfo.amount",
 		a.remarks AS "remarks",
-		a.receiver AS "receiver.id",
-		receiver.name AS "receiver.name"
+		a.receiver AS "receiver"
 	</sql>
 	
 	<sql id="materialRequisitionInfoJoins">
-		LEFT JOIN sys_user receiver ON receiver.id = a.receiver
 		LEFT JOIN t_wh_ledger_info ledgerInfo ON ledgerInfo.id = a.ledger_info_id
 		LEFT JOIN t_wh_material_type tpye ON ledgerInfo.type_id = tpye.id
 	</sql>
@@ -100,7 +98,7 @@
 		) VALUES (
 			#{id},
 			#{materialRequisition.id},
-			#{receiver.id},
+			#{receiver},
 			#{ledgerInfo.id},
 			#{createBy.id},
 			#{createDate},
@@ -115,7 +113,7 @@
 		UPDATE t_wh_material_requisition_info SET 	
 			material_requisition_id = #{materialRequisition.id},
 			ledger_info_id = #{ledgerInfo.id},
-			receiver = #{receiver.id},
+			receiver = #{receiver},
 			update_by = #{updateBy.id},
 			update_date = #{updateDate},
 			remarks = #{remarks}