物资管理-入库、库存修改

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/contract/mapper/xml/ContractMapper.xml

@@ -23,7 +23,8 @@
 			a.signing_date,
 			a.effective_date,
 			a.end_time,
-			a.name
+			a.name,
+			a.contract_no
 		FROM
 			material_management_contract a
 			${ew.customSqlSegment}

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/domain/WareHouseBasic.java

@@ -65,6 +65,11 @@ public class WareHouseBasic extends BaseEntity {
     private String handledBy;
 
     /**
+     * 合同编号
+     */
+    private String contractNo;
+
+    /**
      * 经办人部门
      */
     private String handledByOffice;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/mapper/xml/WareHouseBasicMapper.xml

@@ -87,10 +87,10 @@
 			material_management_warehouse_detailed c on b.id = c.basic_id and c.del_flag = 0) d
 			on a.trade_name = d.trade_name
 			left join
-			(select f.id,collect_no,goods_name,handled_by,handled_by_office,collect_date
+			(select f.id,status,collect_no,goods_name,handled_by,handled_by_office,collect_date
 			from material_management_collect_detailed e
 			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0) g
-			on a.trade_name = g.goods_name
+			on a.trade_name = g.goods_name and g.status = 5
 
 			left join sys_user sy on sy.id = d.handled_by
 			left join sys_office so on sy.office_id = so.id

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/wareHouse/service/dto/WareHouseDto.java

@@ -239,4 +239,9 @@ public class WareHouseDto {
      * 领用时间
      */
     private String collectDate;
+
+    /**
+     * 合同编号
+     */
+    private String contractNo;
 }