fenghaifu преди 2 години
родител
ревизия
c19c35c34f

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

@@ -575,7 +575,7 @@
 		isnull(c.cbatchproperty9,'') as cVenAbbName
 		from om_momain a
 		inner join OM_MODetails b on a.moid=b.moid
-		inner join rdrecords32 c on c.iorderdid  =b.isosid
+		inner join rdrecords32 c on c.iorderdid  =b.isosid and b.cinvcode=c.cinvcode
 		INNER JOIN Inventory d ON c.cinvcode = d.cinvcode
 		where a.ccode like CONCAT(#{code},'%')  and a.ccode not like '%样%' and
 			(d.cInvCCode like '01%' or d.cInvCCode like '02%' or d.cInvCCode like '03%' or d.cInvCCode like '04%')

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

@@ -1008,7 +1008,7 @@ public class FabricLossServiceImpl extends ServiceImpl<FabricLossMapper, FabricL
 
 				for (FabricMoOrderCK ckItem : outList){
 					Double dOutLeft = ckItem.getIQuantityOut();
-					if (ckItem.getMODetailsID().equals(item.getMODetailsID())){
+					if (ckItem.getMODetailsID().equals(item.getMODetailsID().toString())){
 						for (FabricCommonIn inItem : inList){
 							if (inItem.getInvId().equalsIgnoreCase(ckItem.getInvOutId()) && inItem.getIQuantity()>0){
 								Double dCurSum = inItem.getIQuantity();