Explorar o código

面料损耗更新

fenghaifu %!s(int64=2) %!d(string=hai) anos
pai
achega
31a8b078a2

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/mapper/xml/FabricLossMapper.xml

@@ -13,7 +13,7 @@
 		exists (select x.moid from om_mobody x inner join Inventory y on x.cinvcode=y.cinvcode where x.moid=om_momain.moid and
 		(y.cInvCCode like '01%' or y.cInvCCode like '02%' or y.cInvCCode like '03%' or y.cInvCCode like '04%')   )
 		and
-		exists (select x.cVenCode from Vendor x where x.cVenCode=om_momain.cVenCode and x.cVCCode in ('0105','0107','0108'))
+		exists (select x.cVenCode from Vendor x where x.cVenCode=om_momain.cVenCode and x.cVCCode in ('0104','0105','0102'))
 		and (cCode like CONCAT(#{code},'%') and cCode not like '%样%')
 	</select>
 	<!-- 排单数量 -->

+ 4 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/service/impl/FabricLossServiceImpl.java

@@ -1166,7 +1166,10 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 			// 获取委外订单出库物料入库详情
 			List<String> invIdList = new ArrayList<>();
 			outList.forEach(e->invIdList.add(e.getInvOutId()));
-			List<FabricCommonIn> inList = fabricLossMapper.getInListByInvId(invIdList);
+			List<FabricCommonIn> inList = new ArrayList<>();
+			if (oConvertUtils.listIsNotEmpty(invIdList)) {
+				fabricLossMapper.getInListByInvId(invIdList);
+			}
 			// 设置价格比例,入库价格保留四位小数
 			inList.forEach(e->{
 				if (e.getIQuantityInvoice() != 0 && e.getIQuantitySettle() != 0){