景聚庭-商品管理新版需求完善

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/loss/mapper/xml/PsiLossBasicMapper.xml

@@ -26,7 +26,7 @@
             a.handled_by,
             a.handled_by_office,
             a.collect_date AS lossDate,
-            b.goods_name,
+            t.name as goodsName,
             b.id AS detail_id,
             so.name AS handledByOfficeName,
             su.name AS handledByName,
@@ -35,6 +35,7 @@
         LEFT JOIN sys_user su ON a.handled_by = su.id
         LEFT JOIN sys_office so ON su.office_id = so.id
         LEFT JOIN psi_management_loss_detailed b ON a.id = b.basic_id AND b.del_flag = '0'
+        LEFT JOIN psi_management_type t ON b.collect_type = t.id
         LEFT JOIN act_ru_task art ON a.proc_ins_id = art.PROC_INST_ID_
         ${ew.customSqlSegment}
         ORDER BY a.update_time DESC
@@ -42,7 +43,7 @@
 
     <select id="getLossByTradeName" resultType="com.jeeplus.psimanage.loss.domain.PsiLossDetailed">
         SELECT
-            a.goods_name,
+            t.name as goodsName,
             b.id,
             so.name AS handledByOfficeName,
             su.name AS handledByName,
@@ -55,6 +56,8 @@
             left join psi_management_loss_basics b on a.basic_id = b.id
                  LEFT JOIN sys_user su ON b.handled_by = su.id
                  LEFT JOIN sys_office so ON su.office_id = so.id
+            LEFT JOIN psi_management_type t ON a.collect_type = t.id
+
             ${ew.customSqlSegment}
         ORDER BY a.update_time DESC
     </select>

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/loss/service/PsiLossService.java

@@ -247,7 +247,7 @@ public class PsiLossService {
             queryWrapper.like("a.collect_no", dto.getLossNo());
         }
         if (StringUtils.isNotBlank(dto.getGoodsName())) {
-            queryWrapper.like("b.goods_name", dto.getGoodsName());
+            queryWrapper.like("t.name", dto.getGoodsName());
         }
         if (StringUtils.isNotBlank(dto.getHandledBy())) {
             queryWrapper.eq("su.id", dto.getHandledBy());
@@ -287,8 +287,11 @@ public class PsiLossService {
         if (StringUtils.isNotBlank(dto.getLossNo())) {
             queryWrapper.like("b.collect_no", dto.getLossNo());
         }
-        if (StringUtils.isNotBlank(dto.getGoodsName())) {
-            queryWrapper.eq("a.goods_name", dto.getGoodsName());
+        //if (StringUtils.isNotBlank(dto.getGoodsName())) {
+        //    queryWrapper.eq("t.name", dto.getGoodsName());
+        //}
+        if(StringUtils.isNotBlank(dto.getCollectType())){
+            queryWrapper.eq("t.id", dto.getCollectType());
         }
         if (dto.getLossDates() != null && dto.getLossDates().length == 2) {
             queryWrapper.between("b.collect_date", dto.getLossDates()[0], dto.getLossDates()[1]);

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/mapper/xml/PsiWareHouseBasicMapper.xml

@@ -152,6 +152,7 @@
 			left join psi_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
 			GROUP BY a.ware_house_type
+			HAVING SUM(CAST(IFNULL(NULLIF(a.current_inventory, ''), '0') AS DECIMAL(18,4))) > 0
 			ORDER BY a.ware_house_type DESC,a.trade_name
 	</select>
 
@@ -166,8 +167,8 @@
 			c.company,
 			c.name as wareHouseTypeName,
 			IFNULL(his_detail.trade_number,0)  AS allNumber,
-			b.collect_number AS borrowNumber,
-			loss.loss_number AS lossNumber,
+			IFNULL(b.collect_number,0) AS borrowNumber,
+			IFNULL(loss.loss_number,0) AS lossNumber,
 			IFNULL(loss_after.loss_number, 0) AS afterLossNumber,
 			IFNULL(after_pmwd.trade_number, 0) AS afterTradeNumber,
 			IFNULL(after_pmcdra.not_surplus_stock, 0) AS afterNotSurplusStock,
@@ -303,6 +304,7 @@
 				left join psi_management_type c on a.ware_house_type = c.id
 			${ew.customSqlSegment}
 		GROUP BY a.ware_house_type
+		HAVING SUM(CAST(IFNULL(NULLIF(all_stock.allCurrentInventory, ''), '0') AS DECIMAL(18,4))) > 0
 		ORDER BY a.ware_house_type DESC,a.trade_name
 	</select>
 
@@ -422,7 +424,7 @@
 			a.ware_house_date,
 			sy.name as wareHouseHandledBy,
 			so.name as wareHouseHandledByOff,
-			b.trade_name,
+			t.name as tradeName,
 			b.trade_number,
 			b.current_inventory,
 			b.ware_house_type,
@@ -434,6 +436,7 @@
 			psi_management_warehouse_basics a
 			LEFT JOIN
 			psi_management_warehouse_detailed b on a.id = b.basic_id and b.del_flag = 0
+			LEFT JOIN psi_management_type t ON b.ware_house_type = t.id
 
 			left join sys_user sy on sy.id = a.handled_by
 			left join sys_office so on sy.office_id = so.id
@@ -451,7 +454,8 @@
 			so.name as collectHandleByOff,
 			a.collect_date,
 			b.collect_number,
-			b.current_inventory,
+			b.current_inventory as currentInventory,
+			c.name AS goodsName,
 			pmwd.spec,
 			pmcdr.not_surplus_stock as notSurplusStock,
 			b.collect_type as collectType
@@ -461,6 +465,7 @@
 			psi_management_collect_detailed b on a.id = b.basic_id and b.del_flag = 0
 			LEFT JOIN psi_management_collect_detailed_record pmcdr ON b.id = pmcdr.detail_id
 			LEFT JOIN psi_management_warehouse_detailed pmwd ON pmcdr.inventory_id = pmwd.id
+			LEFT JOIN psi_management_type c ON b.collect_type = c.id
 			left join sys_user sy on sy.id = a.handled_by
 			left join sys_office so on sy.office_id = so.id
 
@@ -605,13 +610,12 @@
 		left join
 		(select sum(collect_number) as collect_number,collect_type from psi_management_collect_detailed e
 		left join psi_management_collect_basics f on e.basic_id = f.id and f.del_flag = 0
-		WHERE f.`status` = 5 and e.del_flag = 0 and e.create_time &lt;= #{createDate} and e.collect_type = #{wareHouseType} and e.goods_name = #{tradeName}
+		WHERE f.`status` = 5 and e.del_flag = 0 and e.create_time &lt;= #{createDate} and e.collect_type = #{wareHouseType}
 		GROUP BY e.collect_type) b
 		on a.ware_house_type = b.collect_type
 
 		WHERE a.ware_house_type = #{wareHouseType}
 		and a.del_flag = 0
-		and a.trade_name = #{tradeName}
 		and a.create_time &lt;= #{createDate}
 		GROUP BY a.ware_house_type
 		ORDER BY a.ware_house_type DESC

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/psiWareHouse/service/PsiWareHouseBasicService.java

@@ -126,11 +126,6 @@ public class PsiWareHouseBasicService {
             queryWrapper.eq("b.id", dto.getDetailId());
         }
 
-        if (StringUtils.isNotEmpty(dto.getTradeName())) {
-            queryWrapper.eq("b.trade_name", dto.getTradeName());
-        }
-
-
         if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
             queryWrapper.eq("b.ware_house_type", dto.getWareHouseType());
         }
@@ -170,17 +165,13 @@ public class PsiWareHouseBasicService {
 
         queryWrapper.eq("a.del_flag", "0");
         queryWrapper.eq("a.status", "5");
-        if (StringUtils.isNotEmpty(dto.getTradeName())) {
-            queryWrapper.eq("b.goods_name", dto.getTradeName());
-        }
-
         if (StringUtils.isNotEmpty(dto.getCollectNo())) {
             queryWrapper.eq("a.collect_no", dto.getCollectNo());
         }
 
 
         if (StringUtils.isNotEmpty(dto.getWareHouseType())) {
-            queryWrapper.eq("b.ware_house_type", dto.getWareHouseType());
+            queryWrapper.eq("b.collect_type", dto.getWareHouseType());
         }
 
         String[] collectDates = dto.getCollectDates();
@@ -1012,6 +1003,9 @@ public class PsiWareHouseBasicService {
         if (StringUtils.isNotEmpty(dto.getTradeName())) {
             queryWrapper.like("c.name", dto.getTradeName());
         }
+        if (StringUtils.isNotEmpty(dto.getBrand())) {
+            queryWrapper.like("c.brand", dto.getBrand());
+        }
         queryWrapper.and(wq ->{
             wq.eq("bas.`status`","0")
                     .or()