Merge remote-tracking branch 'origin/master'

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/cw/invoice/mapper/xml/CwFinanceInvoiceMapper.xml

@@ -231,8 +231,6 @@
         <include refid="Base_Column_List"></include>,
         su.name as operator,
         so.name as operator_office,
-        art.ID_ as task_id,
-        art_invalid.ID_ as invalid_task_id,
         (select
         CASE
         WHEN RIGHT( GROUP_CONCAT(case when program_id is null then 2 else 1 end),1) =2 THEN GROUP_CONCAT(concat('其他：',wipr1.program_name))
@@ -248,9 +246,6 @@
         left join sys_user su on fi.create_by = su.id and su.del_flag = '0'
         left join sys_user_manage_office sumo on sumo.office_id = su.office_id
         left join sys_office so on su.office_id = so.id and so.del_flag = '0'
-        left join act_ru_task art ON fi.proc_ins_id = art.PROC_INST_ID_
-        left join cw_finance_invoice_invalid cfii on cfii.invoice_id = fi.id and cfii.del_flag = '0'
-        left join act_ru_task art_invalid ON cfii.proc_ins_id = art_invalid.PROC_INST_ID_
         ${ew.customSqlSegment}
         ORDER BY
         fi.create_date DESC, cfid.number asc

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/domain/CollectDetailed.java

@@ -18,6 +18,11 @@ import java.util.List;
 public class CollectDetailed extends BaseEntity {
 
     /**
+     * 当前库存
+     */
+    private String currentInventory;
+
+    /**
      * 领用基础表id
      */
     private String basicId;

jeeplus-module/jeeplus-test/src/main/java/com/jeeplus/test/materialManagement/collect/service/CollectService.java

@@ -212,6 +212,7 @@ public class CollectService {
                         if (null != wareHouseNum) {
                             double num = wareHouseNum - Double.parseDouble(detailInfo.getCollectNumber());
                             detailInfo.setSurplusNumber(wareHouseNum + "");
+
                             detailedMapper.updateById(detailInfo);
                             //当小于5的时候发起通知
                             if (wareHouseNum <= 5 ) {
@@ -281,6 +282,8 @@ public class CollectService {
                 //获取该商品对应的库存数据
                 WareHouseDto wareHouseDto = wareHouseBasicMapper.getByTypeAndGoodsName(detailed.getGoodsName(), detailed.getCollectTypeId());
                 detailed.setSurplusNumber(wareHouseDto.getTradeNumber());
+                //设置当前库存
+                detailed.setCurrentInventory(wareHouseDto.getTradeNumber());
                 detailedMapper.insert(detailed);
                 //保存详情列表附件信息
                 if (CollectionUtils.isNotEmpty(detailed.getFileInfoLost())){

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

@@ -18,6 +18,11 @@ import java.util.List;
 public class WareHouseDetailed extends BaseEntity {
 
     /**
+     * 当前库存
+     */
+    private String currentInventory;
+
+    /**
      * 入库基础表id
      */
     private String basicId;

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

@@ -61,9 +61,9 @@
 					LEFT JOIN material_management_collect_basics f ON e.basic_id = f.id
 					AND f.del_flag = 0
 					LEFT JOIN material_management_type c ON e.collect_type = c.id
-					left join material_management_collect_detailed g on e.goods_name = g.goods_name
+					left join material_management_collect_detailed g on e.goods_name = g.goods_name and g.del_flag = 0
 				WHERE
-					f.`status` = 5
+					f.`status` = 5 AND e.del_flag = 0
 				GROUP BY
 					e.id
 				) b ON a.trade_name = b.goods_name
@@ -99,8 +99,7 @@
 			left join material_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
 			GROUP BY a.trade_name
-			HAVING sum( trade_number ) - IFNULL(collect_number,0) > 0
-			ORDER BY a.update_date DESC
+			ORDER BY a.ware_house_type DESC
 	</select>
     <select id="findRequestId" resultType="java.lang.String">
 		select id from material_management_pruchase_request_basics where purchase_no = #{purchaseNo} and del_flag = 0
@@ -115,7 +114,8 @@
 			sy.name as wareHouseHandledBy,
 			so.name as wareHouseHandledByOff,
 			b.trade_name,
-			b.trade_number
+			b.trade_number,
+			b.current_inventory
 		FROM
 			material_management_warehouse_basics a
 			LEFT JOIN
@@ -136,7 +136,8 @@
 			so.name as collectHandleByOff,
 			a.collect_date,
 			b.goods_name,
-			b.collect_number
+			b.collect_number,
+			b.current_inventory
 		FROM
 			material_management_collect_basics a
 			LEFT JOIN
@@ -166,15 +167,14 @@
 			left join
 			(select sum(collect_number) as collect_number,goods_name,status from material_management_collect_detailed e
 			left join material_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0
-			WHERE f.`status` = 5
+			WHERE f.`status` = 5 and e.collect_type = #{collectTypeId}
 			) b
 			on a.trade_name = b.goods_name
 
 			LEFT JOIN material_management_warehouse_basics bas on a.basic_id = bas.id
 			left join material_management_type c on a.ware_house_type = c.id
-			where a.trade_name = #{goodsName} and a.ware_house_type = #{collectTypeId}
+			where a.trade_name = #{goodsName} and a.ware_house_type = #{collectTypeId} and a.del_flag = 0
 			GROUP BY a.trade_name
-			HAVING sum( trade_number ) - IFNULL(collect_number,0) > 0
 			ORDER BY a.update_date DESC
 	</select>
 	<update id="saveUpdateUser">

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

@@ -82,6 +82,8 @@ public class WareHouseBasicService {
     @Resource
     private WarehouseUpHiMapper warehouseUpHiMapper;
 
+    @Resource
+    private WareHouseBasicMapper wareHouseBasicMapper;
 
     /**
      * 列表查询
@@ -94,6 +96,10 @@ public class WareHouseBasicService {
             queryWrapper.like("b.trade_name", dto.getTradeName());
         }
 
+        if (StringUtils.isNotEmpty(dto.getWareHouseNumber())) {
+            queryWrapper.like("a.ware_house_number", dto.getWareHouseNumber());
+        }
+
         String[] wareHouseDates = dto.getWareHouseDates();
         if (wareHouseDates != null) {
 
@@ -121,6 +127,10 @@ public class WareHouseBasicService {
             queryWrapper.like("b.goods_name", dto.getTradeName());
         }
 
+        if (StringUtils.isNotEmpty(dto.getCollectNo())) {
+            queryWrapper.like("a.collect_no", dto.getCollectNo());
+        }
+
         String[] collectDates = dto.getCollectDates();
         if (collectDates != null) {
 
@@ -516,6 +526,17 @@ public class WareHouseBasicService {
                 detailed.setBasicId(id);
                 detailed.setTradeTotalPrice(dto.getWareHouseTotalPrice());
                 detailed.setUpFlag("0");
+                //获取该商品对应的库存数据
+                WareHouseDto wareHouseDto = wareHouseBasicMapper.getByTypeAndGoodsName(detailed.getTradeName(), detailed.getWareHouseTypeId());
+                //设置当前库存
+                if (null == wareHouseDto){
+                    detailed.setCurrentInventory("");
+                } else {
+//                        Double num1 = Double.parseDouble(detailInfo.getTradeNumber());
+//                        Double num2 = Double.parseDouble(wareHouseDto.getTradeNumber());
+//                        String sum = num1 + num2 + "";
+                    detailed.setCurrentInventory(wareHouseDto.getTradeNumber());
+                }
                 detailedMapper.insert(detailed);
                 //保存详情列表附件信息
                 if (CollectionUtils.isNotEmpty(detailed.getFileInfoLost())){

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

@@ -18,6 +18,11 @@ import java.util.List;
 public class WareHouseDto {
 
     /**
+     * 当前库存
+     */
+    private String currentInventory;
+
+    /**
      * 采购申请查看入库记录所需
      */
     private String[] statusTwo;