景聚庭-库存查询展示调整

jeeplus-modules/jeeplus-psi-management/src/main/java/com/jeeplus/psimanage/collect/service/PsiCollectService.java

@@ -414,7 +414,7 @@ public class PsiCollectService {
                         List<PsiWareHouseDetailed> infoByProduceDateDesc = new ArrayList<>();
                         for (PsiCollectDetailedRecord psiCollectDetailedRecord : recordList) {
                             //如果领用详情的分类和物品名  跟  领用分配的相同
-                            if(detailInfo.getCollectTypeId().equals(psiCollectDetailedRecord.getCollectTypeId()) && detailInfo.getGoodsName().equals(psiCollectDetailedRecord.getGoodsName())){
+                            if(detailInfo.getCollectTypeId().equals(psiCollectDetailedRecord.getCollectTypeId())){
                                 String recordId = UUID.randomUUID().toString().replace("-", "");
                                 psiCollectDetailedRecord.setSurplusStock("0");//退回数量
                                 psiCollectDetailedRecord.setReturnedNum("0");//已退回数量

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

@@ -497,8 +497,7 @@
 			on a.ware_house_type = b.collect_type
 			LEFT JOIN psi_management_warehouse_basics bas on a.basic_id = bas.id
 			left join psi_management_type c on a.ware_house_type = c.id
-			where a.trade_name = #{goodsName}
-			  and a.ware_house_type = #{collectTypeId}
+			where a.ware_house_type = #{collectTypeId}
 			  and a.del_flag = 0
 			GROUP BY a.ware_house_type
 			ORDER BY a.update_time DESC
@@ -527,8 +526,7 @@
 
 				LEFT JOIN psi_management_warehouse_basics bas on a.basic_id = bas.id
 				left join psi_management_type c on a.ware_house_type = c.id
-		where a.trade_name = #{goodsName}
-		  and a.ware_house_type = #{collectTypeId}
+		where a.ware_house_type = #{collectTypeId}
 		  and a.produce_date = #{produceDate}
 		  and a.del_flag = 0
 		GROUP BY a.ware_house_type,a.produce_date
@@ -557,8 +555,7 @@
 			on a.ware_house_type = b.collect_type
 				LEFT JOIN psi_management_warehouse_basics bas on a.basic_id = bas.id
 				left join psi_management_type c on a.ware_house_type = c.id
-		where a.trade_name = #{goodsName}
-		  and a.ware_house_type = #{collectTypeId}
+		where a.ware_house_type = #{collectTypeId}
 		  and a.del_flag = 0
 		ORDER BY a.produce_date asc
 	</select>
@@ -595,14 +592,13 @@
 
 		WHERE a.ware_house_type = #{wareHouseType}
 		and a.del_flag = 0
-		and a.trade_name = #{tradeName}
 		and a.produce_date &lt;= #{produceDate}
 		GROUP BY a.ware_house_type
 		ORDER BY a.ware_house_type DESC
 	</select>
 	<select id="getCollectInfoByTime" resultType="java.lang.String">
 		SELECT
-		IFNULL((sum(trade_number) - collect_number),sum(trade_number)) as tradeNumber
+			GREATEST( IFNULL(SUM(trade_number) - collect_number, SUM(trade_number)), 0 ) AS tradeNumber
 		FROM
 		psi_management_warehouse_detailed a
 		left join psi_management_type c on a.ware_house_type = c.id

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

@@ -20,7 +20,6 @@
                 AND c.del_flag = 0
             WHERE
                 b.collect_type = #{wareHouseType}
-                AND b.goods_name = #{tradeName}
 
             AND b.del_flag = 0
             AND c.`status` = 5
@@ -29,7 +28,6 @@
 
         WHERE
             a.ware_house_type = #{wareHouseType}
-            AND a.trade_name = #{tradeName}
             AND a.del_flag = 0
     </select>
     <select id="getInfoByBasicId"
@@ -63,7 +61,6 @@
                                   ON b.basic_id = c.id AND c.del_flag = 0
                 WHERE
                     b.collect_type = #{wareHouseType}
-                  AND b.goods_name = #{tradeName}
                   AND b.del_flag = 0
                   AND c.`status` = 5
                 -- 按商品  生产日期分组
@@ -73,7 +70,6 @@
                               AND a.produce_date = c.produce_date  -- 关键：按生产日期匹配
         WHERE
             a.ware_house_type = #{wareHouseType}
-          AND a.trade_name = #{tradeName}
           AND a.del_flag = 0
 
         GROUP BY a.id  -- 按库存分组