成本分配

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/entity/SyCostAllocation.java

@@ -203,6 +203,11 @@ public class SyCostAllocation implements Serializable {
     @ApiModelProperty(value = "供应商事故单人民币金额")
     private java.math.BigDecimal supperAccidentcnyAmount;
 
+    //发票数量（用来计划表头的面料成本）
+    private BigDecimal invoiceQuantity;
+
+    //存货名称
+    private String cInvName;
 
     //表头备注
     private String memo;

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/SyCostAllocationMapper.java

@@ -25,5 +25,5 @@ public interface SyCostAllocationMapper extends BaseMapper<SyCostAllocation> {
 
     //查询改计划号的所有采购发票
     @DS("multi-three")
-    SyCostAllocation queryPurBillVouchByFabric(@Param("code") String code);
+    List<SyCostAllocation> queryPurBillVouchByFabric(@Param("code") String code);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationFabricMapper.xml

@@ -31,7 +31,7 @@
 		)/tab3.purchaseQuantity,0) as loss
 		from
 		(
-		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
+		select oti.cInvName as goodsName,sum(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		from UFDATA_101_2021.dbo.om_momain om
 		join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
@@ -39,8 +39,9 @@
 		join UFDATA_101_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
-		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
-		GROUP BY oti.cInvName,ot.iUnitQuantity
+		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%')
+		and (oti.cInvCCode != '0499' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%')
+		GROUP BY oti.cInvName
 		) tab
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
@@ -54,7 +55,8 @@
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		 and om.cPOID like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
+		and (i.cInvCCode != '0499' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%') and (i.cInvCCode != '0299' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
 		 and rs.cBatch like CONCAT(#{code},'%')
 		GROUP BY i.cInvName
 		)tab1
@@ -69,7 +71,8 @@
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
+		and (i.cInvCCode != '0499' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%') and (i.cInvCCode != '0299' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
 
 		GROUP BY i.cInvName
 		)tab2 on tab2.cInvName=tab1.cInvName and tab2.cBatch=tab1.cBatch
@@ -92,7 +95,7 @@
 		)/tab3.purchaseQuantity,0) as loss
 		from
 		(
-		select oti.cInvName as goodsName,max(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
+		select oti.cInvName as goodsName,sum(ot.iUnitQuantity) as unitConsumption,sum(ot.iQuantity) as planQuantity,
 		sum(ot.iSendQTY) as usageQuantity
 		from UFDATA_103_2021.dbo.om_momain om
 		join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
@@ -100,8 +103,9 @@
 		join UFDATA_103_2021.dbo.Inventory oti on oti.cInvCode=ot.cInvCode
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
-		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%带%') and (oti.cInvCCode != '0499' or oti.cInvName like '%带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%带%')
-		GROUP BY oti.cInvName,ot.iUnitQuantity
+		and (oti.cInvCcode like '03%' or oti.cInvCcode like '04%' or oti.cInvCcode like '02%') and (oti.cInvCCode != '0399' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%')
+		and (oti.cInvCCode != '0499' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%') and (oti.cInvCCode != '0299' or oti.cInvName like '%圆带%' or oti.cInvName like '%人字带%')
+		GROUP BY oti.cInvName
 		) tab
 		left join
 		( select tab2.cinvName,sum(tab1.purchaseQuantity) as purchaseQuantity,sum(tab2.jian) as jian from
@@ -115,7 +119,8 @@
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		 and om.cPOID like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
+		and (i.cInvCCode != '0499' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%') and (i.cInvCCode != '0299' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
 		 and rs.cBatch like CONCAT(#{code},'%')
 		GROUP BY i.cInvName
 		)tab1
@@ -130,8 +135,9 @@
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
-		and rs.cBatch like CONCAT(#{code},'%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
+		and (i.cInvCCode != '0499' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%') and (i.cInvCCode != '0299' or i.cInvName like '%圆带%' or i.cInvName like '%人字带%')
+		and rs.cBatch =#{code}
 		GROUP BY i.cInvName
 		)tab2 on tab2.cInvName=tab1.cInvName and tab2.cBatch=tab1.cBatch
 		GROUP BY tab2.cInvName
@@ -170,7 +176,9 @@
 		join UFDATA_101_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%')
+		and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%')
+		and (i.cInvCCode != '0299' or i.cInvName like '%带%')
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
 		)tab2 on tab2.cInvName=tab1.cInvName and tab2.cBatch=tab1.cBatch and tab1.cfree1=tab2.cfree1
 		where tab2.jian-isnull(tab1.purchaseQuantity,0) > 0 and tab2.cinvName = #{goodName}
@@ -206,7 +214,9 @@
 		join UFDATA_103_2021.dbo.Inventory omi on omi.cInvCode=od.cInvCode
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode like CONCAT(#{code},'%')
-		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%') and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%') and (i.cInvCCode != '0299' or i.cInvName like '%带%')
+		) and (i.cInvCcode like '03%' or i.cInvCcode like '04%' or i.cInvCcode like '02%')
+		and (i.cInvCCode != '0399' or i.cInvName like '%带%') and (i.cInvCCode != '0499' or i.cInvName like '%带%')
+		and (i.cInvCCode != '0299' or i.cInvName like '%带%')
 		GROUP BY i.cInvName,rs.cBatch,rs.cFree1
 		)tab2 on tab2.cInvName=tab1.cInvName and tab2.cBatch=tab1.cBatch and tab1.cfree1=tab2.cfree1
 		where tab2.jian-isnull(tab1.purchaseQuantity,0) > 0 and tab2.cinvName = #{goodName}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationIngredientMapper.xml

@@ -52,7 +52,7 @@ WHERE
 	AND ( om.cCloser IS NULL OR om.cCloser= 'asuser' ) 
 	AND omi.cInvCcode LIKE '19%' 
 	AND om.cCode LIKE CONCAT(#{code},'%')
-	AND (oti.cInvCcode LIKE '05%' OR oti.cInvCcode LIKE '06%' OR oti.cInvCcode LIKE '07%' OR oti.cInvCCode = '0399' OR oti.cInvCCode = '0299' OR oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%带%'
+	AND (oti.cInvCcode LIKE '05%' OR oti.cInvCcode LIKE '06%' OR oti.cInvCcode LIKE '07%' OR oti.cInvCCode = '0399' OR oti.cInvCCode = '0299' OR oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%圆带%' AND oti.cInvName NOT LIKE '%人字带%'
 GROUP BY ot.cInvCode,od.isosid,om.ccode,oti.cInvName ) AS t1 
 
 	left join (SELECT ven.cVenAbbName AS cVenAbbName,bi.cInvCode,pod.isosid,SUM ( bi.iSum ) AS rmbAmount,SUM ( bi.iOriSum ) AS usdAmount,
@@ -97,7 +97,7 @@ WHERE
 	AND ( om.cCloser IS NULL OR om.cCloser= 'asuser' ) 
 	AND omi.cInvCcode LIKE '19%' 
 	AND om.cCode LIKE CONCAT(#{code},'%')
-	AND (oti.cInvCcode LIKE '05%' OR oti.cInvCcode LIKE '06%' OR oti.cInvCcode LIKE '07%' OR oti.cInvCCode = '0399' OR oti.cInvCCode = '0299' OR oti.cInvCCode = '0499'  ) AND oti.cInvName NOT LIKE '%带%'
+	AND (oti.cInvCcode LIKE '05%' OR oti.cInvCcode LIKE '06%' OR oti.cInvCcode LIKE '07%' OR oti.cInvCCode = '0399' OR oti.cInvCCode = '0299' OR oti.cInvCCode = '0499'  ) AND oti.cInvName NOT LIKE '%圆带%' AND oti.cInvName NOT LIKE '%人字带%'
 GROUP BY ot.cInvCode,od.isosid,om.ccode,oti.cInvName ) AS t1 
 
 	left join (SELECT ven.cVenAbbName AS cVenAbbName,bi.cInvCode,pod.iorderdid,SUM ( bi.iSum ) AS rmbAmount,SUM ( bi.iOriSum ) AS usdAmount,
@@ -146,7 +146,7 @@ GROUP BY
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-		or i.cInvCCode = '0399' or i.cInvCCode = '0499'  or i.cInvCCode = '0299') and rs.cBatch LIKE CONCAT(#{code},'%') and i.cInvName not like '%带%'
+		or i.cInvCCode = '0399' or i.cInvCCode = '0499'  or i.cInvCCode = '0299') and rs.cBatch LIKE CONCAT(#{code},'%') and i.cInvName not like '%圆带%' AND i.cInvName NOT LIKE '%人字带%'
 		GROUP BY i.cInvName--,rs.cBatch
 		)tab2 on tab2.cInvName=tab.goodsName
 
@@ -179,7 +179,7 @@ GROUP BY
 
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
-		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%带%'
+		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%圆带%' AND oti.cInvName NOT LIKE '%人字带%'
 		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
@@ -211,7 +211,7 @@ GROUP BY
 
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
-		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%带%'
+		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' ) AND oti.cInvName NOT LIKE '%圆带%' AND oti.cInvName NOT LIKE '%人字带%'
 		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1
 		left join (
@@ -246,7 +246,7 @@ GROUP BY
 
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and omi.cInvCcode like '19%'
 		and om.cCode LIKE CONCAT(#{code},'%') and (oti.cInvCcode like '05%' or oti.cInvCcode like '06%'
-		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' )AND oti.cInvName NOT LIKE '%带%'
+		or oti.cInvCcode like '07%' or oti.cInvCCode = '0399' or oti.cInvCCode = '0299' or oti.cInvCCode = '0499' )AND oti.cInvName NOT LIKE '%圆带%' AND oti.cInvName NOT LIKE '%人字带%'
 		group by ot.cInvCode,od.isosid,om.ccode,oti.cInvName
 		) as t1,
 		(
@@ -280,7 +280,7 @@ GROUP BY
 		WHERE om.cVerifier is not null and (om.cCloser is null or om.cCloser='asuser')
 		and om.cPOID LIKE CONCAT(#{code},'%')
 		) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-		or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')  and i.cInvName not like '%带%'
+		or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')  and i.cInvName not like '%圆带%' AND i.cInvName NOT LIKE '%人字带%'
 		GROUP BY i.cInvName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join
@@ -295,7 +295,7 @@ GROUP BY
 		WHERE om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser')
 		and omi.cInvCcode like '19%' and om.cCode LIKE CONCAT(#{code},'%')
 		) and (i.cInvCcode like '05%' or i.cInvCcode like '06%' or i.cInvCcode like '07%'
-		or i.cInvCCode = '0399' or i.cInvCCode = '0499'  or i.cInvCCode = '0299') and i.cInvName not like '%带%' and rs.cBatch LIKE CONCAT(#{code},'%')
+		or i.cInvCCode = '0399' or i.cInvCCode = '0499'  or i.cInvCCode = '0299') and i.cInvName not like '%圆带%' AND i.cInvName NOT LIKE '%人字带%' and rs.cBatch LIKE CONCAT(#{code},'%')
 		GROUP BY i.cInvName
 		)tab2 on tab2.cInvName=tab.goodsName
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationMapper.xml

@@ -177,8 +177,9 @@
     <select id="queryPurBillVouchByFabric" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
 
 
-	select sum(t.iOriSum) as fabriccostIncludestax,sum(t.iNotOriMoney) as fabriccostNotincludestax, sum(t.cExchRate) as fabriccostIncludestaxUsd from (
-	select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate from UFDATA_101_2021.dbo.PO_Pomain pm
+	select t.cInvName,sum(t.iOriSum) as fabriccostIncludestax,sum(t.iNotOriMoney) as fabriccostNotincludestax, sum(t.cExchRate) as fabriccostIncludestaxUsd,sum(t.invoiceQuantity) as invoiceQuantity from (
+	select omi.cInvName as cInvName,sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate,sum(pbs.iPBVQuantity) as invoiceQuantity
+	from UFDATA_101_2021.dbo.PO_Pomain pm
 	join UFDATA_101_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
 	join UFDATA_101_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
 	join UFDATA_101_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
@@ -186,10 +187,11 @@
 		join UFDATA_101_2021.dbo.SO_SOMain so on pd.csoordercode = so.csocode
 	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299'
 	 and omi.cInvCCode != '07'and omi.cInvCCode != '06'and omi.cInvCCode != '05' and pb.cVenCode not in('T010001','T020001')
-
+   group by omi.cInvName
 	UNION ALL
 
-select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,2)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate from UFDATA_102_2021.dbo.PO_Pomain pm
+select omi.cInvName as cInvName,sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,2)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate,sum(pbs.iPBVQuantity) as invoiceQuantity
+ from UFDATA_102_2021.dbo.PO_Pomain pm
 	join UFDATA_102_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
 	join UFDATA_102_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
 	join UFDATA_102_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
@@ -197,11 +199,12 @@ select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,2)) as iNotOriMone
 		join UFDATA_102_2021.dbo.SO_SOMain so on pd.csoordercode = so.csocode
 	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299'
 	 and omi.cInvCCode != '07'and omi.cInvCCode != '06'and omi.cInvCCode != '05' and pb.cVenCode not in('T010001','T020001')
-
+group by omi.cInvName
 		UNION ALL
 
 
-select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate from UFDATA_103_2021.dbo.PO_Pomain pm
+select omi.cInvName as cInvName,sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMoney,CONVERT(DECIMAL(38,2),sum(pbs.iOriSum)/max(so.iExchRate)) as cExchRate,sum(pbs.iPBVQuantity) as invoiceQuantity
+ from UFDATA_103_2021.dbo.PO_Pomain pm
 	join UFDATA_103_2021.dbo.PO_Podetails pd on pm.POID = pd.POID
 	join UFDATA_103_2021.dbo.PurBillVouchs pbs on pd.ID = pbs.iPOsID
 	join UFDATA_103_2021.dbo.PurBillVouch pb on pb.PBVID  = pbs.PBVID
@@ -209,7 +212,8 @@ select sum(pbs.iOriSum) as iOriSum,sum(round(pbs.iOriSum/1.13,4)) as iNotOriMone
 		join UFDATA_103_2021.dbo.SO_SOMain so on pd.csoordercode = so.csocode
 	where pm.cPOID like CONCAT(#{code},'%') and (omi.cInvCcode like '03%' or omi.cInvCcode like '04%') and omi.cInvCCode != '0399' and omi.cInvCCode != '0499' and omi.cInvCCode != '0299'
 	and omi.cInvCCode != '07'and omi.cInvCCode != '06'and omi.cInvCCode != '05' and pb.cVenCode not in('T010001','T020001')
-		) t where t.iOriSum is not null
+	group by omi.cInvName
+		) t where t.iOriSum is not null group by t.cInvName
 
 
 	</select>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.xml

@@ -26,13 +26,13 @@
 			sh.cSOCode AS orderNum,
 			max(so.cdefine22) AS poStyleNum,
 			max(so.cDefine28) AS smallPo,
-			avg(shs.iTaxUnitPrice) AS exportUnitPrice ,
+			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
-			case when max(so.cexch)='人民币' then avg(so.procesUnitPriceusd) else round(avg(so.procesUnitPriceusd)*sh.iExchRate,4) end as procesUnitPricermb,
-			case when max(so.cexch)='人民币' then 0 else avg(so.procesUnitPriceusd) end as procesUnitPriceusd,
-				case when max(so.cexch)='人民币' then avg(so.procesUnitPriceusd) else round(avg(so.procesUnitPriceusd)*sh.iExchRate,4) end* sum(shs.iQuantity) as processCost,
-			case when max(so.cexch)='人民币' then 0 else avg(so.procesUnitPriceusd) end * sum(shs.iQuantity) as processCostUsd,
+			case when max(so.cexch)='人民币' then max(so.procesUnitPriceusd) else round(max(so.procesUnitPriceusd)*sh.iExchRate,4) end as procesUnitPricermb,
+			case when max(so.cexch)='人民币' then 0 else max(so.procesUnitPriceusd) end as procesUnitPriceusd,
+				case when max(so.cexch)='人民币' then max(so.procesUnitPriceusd) else round(max(so.procesUnitPriceusd)*sh.iExchRate,4) end* sum(shs.iQuantity) as processCost,
+			case when max(so.cexch)='人民币' then 0 else max(so.procesUnitPriceusd) end * sum(shs.iQuantity) as processCostUsd,
 			v.cVenName AS processUnit
 		 FROM
 			UFDATA_101_2021.dbo.SaleBillVouch sh
@@ -49,10 +49,10 @@
 					FROM UFDATA_101_2021.dbo.OM_MOMain om
 					LEFT JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
 					left join UFDATA_101_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
-					WHERE om.iVerifyStateNew = 2 AND om.cCode like CONCAT(#{code},'%') 
+					WHERE om.iVerifyStateNew = 2 AND om.cCode like CONCAT(#{code},'%')
 					GROUP BY od.csoordercode
-				) o ON s.csocode = o.csoordercode 
-			) so ON so.iSOsID = shs.iSOsID 
+				) o ON s.csocode = o.csoordercode
+			) so ON so.iSOsID = shs.iSOsID
 		 LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
 		 group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 
@@ -67,13 +67,13 @@
 			sh.cSOCode AS orderNum,
 			max(so.cdefine22) AS poStyleNum,
 			max(so.cDefine28) AS smallPo,
-			avg(shs.iTaxUnitPrice) AS exportUnitPrice ,
+			max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 			sum(shs.iSum) as exportPrice,
 			sum(iNatSum) as rmbAmount,
-			case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end as procesUnitPricermb,
-			case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end as procesUnitPriceusd,
-				case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end * sum(shs.iQuantity) as processCost,
-			case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end * sum(shs.iQuantity) as processCostUsd,
+			case when max(so.cexch)='人民币' then max(so.iOriTaxCost) else round(max(so.iOriTaxCost)*sh.iExchRate,4) end as procesUnitPricermb,
+			case when max(so.cexch)='人民币' then 0 else max(so.iOriTaxCost) end as procesUnitPriceusd,
+				case when max(so.cexch)='人民币' then max(so.iOriTaxCost) else round(max(so.iOriTaxCost)*sh.iExchRate,4) end * sum(shs.iQuantity) as processCost,
+			case when max(so.cexch)='人民币' then 0 else max(so.iOriTaxCost) end * sum(shs.iQuantity) as processCostUsd,
 			v.cVenName AS processUnit
 		FROM
 			UFDATA_102_2021.dbo.SaleBillVouch sh
@@ -81,15 +81,15 @@
 			LEFT JOIN UFDATA_102_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
 			LEFT JOIN UFDATA_102_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		JOIN (
-			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,avg(o.iOriTaxCost) as iOriTaxCost,max(o.cexch) as cexch,
-					avg(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
+			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,max(o.iOriTaxCost) as iOriTaxCost,max(o.cexch) as cexch,
+					max(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
 						FROM  UFDATA_103_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
 									 SELECT max(om.cexch_name) as cexch,
 									 od.csoordercode as csoordercode,
 									 max(om.cVenCode) AS supplierCode,max(od.cInvCode) as cInvCode,max(od.isosid) as isosid,sum(od.iQuantity) as iQuantity ,
-									 avg(bi.iOriTaxCost) as iOriTaxCost,avg(od.iNatUnitPrice) as iNatUnitPrice
+									 max(bi.iOriTaxCost) as iOriTaxCost,max(od.iNatUnitPrice) as iNatUnitPrice
 									 FROM
 									 UFDATA_103_2021.dbo.OM_MOMain om
 									 inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
@@ -121,14 +121,14 @@
 		sh.cSOCode AS orderNum,
 		max(so.cdefine22) AS poStyleNum,
 		max(so.cDefine28) AS smallPo,
-		avg(shs.iTaxUnitPrice) AS exportUnitPrice ,
+		max(shs.iTaxUnitPrice) AS exportUnitPrice ,
 		sum(shs.iSum) as exportPrice,
 		sum(iNatSum) as rmbAmount,
-		case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end as procesUnitPricermb,
-		case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end as procesUnitPriceusd,
+		case when max(so.cexch)='人民币' then max(so.iOriTaxCost) else round(max(so.iOriTaxCost)*sh.iExchRate,4) end as procesUnitPricermb,
+		case when max(so.cexch)='人民币' then 0 else max(so.iOriTaxCost) end as procesUnitPriceusd,
 
-			case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end * sum(shs.iQuantity) as processCost,
-		case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end * sum(shs.iQuantity) as processCostUsd,
+			case when max(so.cexch)='人民币' then max(so.iOriTaxCost) else round(max(so.iOriTaxCost)*sh.iExchRate,4) end * sum(shs.iQuantity) as processCost,
+		case when max(so.cexch)='人民币' then 0 else max(so.iOriTaxCost) end * sum(shs.iQuantity) as processCostUsd,
 		v.cVenName AS processUnit
 		 FROM
 			UFDATA_101_2021.dbo.SaleBillVouch sh
@@ -136,15 +136,15 @@
 			LEFT JOIN UFDATA_101_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
 			LEFT JOIN UFDATA_101_2021.dbo.rdrecords32 rd ON rd.AutoID = shs.isaleoutid
 		  JOIN (
-			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,avg(o.iOriTaxCost) as iOriTaxCost,max(o.cexch) as cexch,
-					avg(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
+			 SELECT  max(supplierCode) as supplierCode,s.iSOsID,max(o.iOriTaxCost) as iOriTaxCost,max(o.cexch) as cexch,
+					max(o.iNatUnitPrice) as iNatUnitPrice,max(s.cdefine22) as cdefine22,max(s.cDefine28) as cDefine28
 						FROM  UFDATA_103_2021.dbo.SO_SODetails a
 						inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID
 						inner JOIN (
 									 SELECT max(om.cexch_name) as cexch,
 									 od.csoordercode as csoordercode,
 									 max(om.cVenCode) AS supplierCode,max(od.cInvCode) as cInvCode,max(od.isosid) as isosid,sum(od.iQuantity) as iQuantity ,
-									 avg(bi.iOriTaxCost) as iOriTaxCost,avg(od.iNatUnitPrice) as iNatUnitPrice
+									 max(bi.iOriTaxCost) as iOriTaxCost,max(od.iNatUnitPrice) as iNatUnitPrice
 									 FROM
 									 UFDATA_103_2021.dbo.OM_MOMain om
 									 inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
@@ -164,63 +164,6 @@
 						GROUP BY s.iSOsID
 			) so ON so.iSOsID = rd.iorderdid
 		LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
-		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
-		 		UNION ALL
-
-			 SELECT
-			sh.cDefine10 AS invoiceNum,
-			CONVERT(varchar(50), min(sh.dDate), 23) as outdata ,
-			sum(shs.iQuantity) as shipQuantity,
-			sh.iExchRate AS exchangeRate,
-			sh.cSOCode AS orderNum,
-			max(so.cdefine22) AS poStyleNum,
-			max(so.cDefine28) AS smallPo,
-			avg(shs.iTaxUnitPrice) AS exportUnitPrice ,
-			sum(shs.iSum) as exportPrice,
-			sum(iNatSum) as rmbAmount,
-			case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end as procesUnitPricermb,
-			case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end as procesUnitPriceusd,
-				case when max(so.cexch)='人民币' then avg(so.iOriTaxCost) else round(avg(so.iOriTaxCost)*sh.iExchRate,4) end * sum(shs.iQuantity) as processCost,
-			case when max(so.cexch)='人民币' then 0 else avg(so.iOriTaxCost) end * sum(shs.iQuantity) as processCostUsd,
-			v.cVenName AS processUnit
-		FROM
-			UFDATA_101_2021.dbo.SaleBillVouch sh
-			JOIN UFDATA_101_2021.dbo.SaleBillVouchs shs ON sh.SBVID = shs.SBVID
-			LEFT JOIN UFDATA_101_2021.dbo.Inventory c ON c.cInvCode= shs.cInvCode
-
-		JOIN (
-			 SELECT  max(supplierCode) as supplierCode,s1.iSOsID,avg(o.iOriTaxCost) as iOriTaxCost,max(o.cexch) as cexch,
-					avg(o.iNatUnitPrice) as iNatUnitPrice,max(s1.cdefine22) as cdefine22,max(s1.cDefine28) as cDefine28
-						FROM  UFDATA_103_2021.dbo.SO_SODetails a
-						inner JOIN UFDATA_103_2021.dbo.SO_SOMain b on b.ID= a.ID
-						inner JOIN (
-									 SELECT max(om.cexch_name) as cexch,
-									 od.csoordercode as csoordercode,
-									 max(om.cVenCode) AS supplierCode,max(od.cInvCode) as cInvCode,max(od.isosid) as isosid,sum(od.iQuantity) as iQuantity ,
-									 avg(bi.iOriTaxCost) as iOriTaxCost,avg(od.iNatUnitPrice) as iNatUnitPrice
-									 FROM
-									 UFDATA_103_2021.dbo.OM_MOMain om
-									 inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
-									 left join UFDATA_103_2021.dbo.PurBillVouchs bi  on bi.iPOsID=od.MODetailsID
-									 WHERE
-									 om.iVerifyStateNew = 2 and (om.cCloser is null or om.cCloser='asuser') and om.cCode like CONCAT(#{code},'%')
-									 GROUP BY od.csoordercode
-									 ) o ON a.csocode = o.csoordercode
-						inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
-						inner JOIN UFDATA_103_2021.dbo.Inventory c on c.cInvCode=a.cInvCode
-						inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
-						inner join UFDATA_102_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
-						inner join UFDATA_102_2021.dbo.po_podetails g on g.POID=f.POID and g.ivouchrowno=a.iRowNo
-						inner join UFDATA_102_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
-						inner join UFDATA_102_2021.dbo.so_somain ss on ss.id=s.id
-						inner join UFDATA_101_2021.dbo.PO_Pomain f1 on f1.cPOID=ss.csocode
-						inner join UFDATA_101_2021.dbo.po_podetails g1 on g1.POID=f1.POID and g1.ivouchrowno=s.iRowNo
-						inner join UFDATA_101_2021.dbo.SO_SODetails s1 on s1.iSOsID=g1.iorderdid
-						inner join UFDATA_101_2021.dbo.so_somain ss1 on ss1.id=s1.id
-						WHERE b.cCusCode in ('T020001','0001') and ss.cCusCode in ('T020001','0001') and c.cInvCcode like '19%'
-						GROUP BY s1.iSOsID
-			) so ON so.iSOsID = shs.iSOsID
-		LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON so.supplierCode= v.cVenCode
 		group by sh.cDefine10,sh.iExchRate,sh.cSOCode,c.cInvName, v.cVenName
 
 		 ) t order by t.outdata

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -214,20 +214,6 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             //美元面料含税成本和不含税成本
             syCostAllocation.setFabriccostIncludestaxUsd(syCostAllocation.getFabriccostIncludestax().divide(syCostAllocation.getExchangeRate(),2,BigDecimal.ROUND_HALF_UP));
             syCostAllocation.setFabriccostNotincludestaxUsd(syCostAllocation.getFabriccostNotincludestax().divide(syCostAllocation.getExchangeRate(),2,BigDecimal.ROUND_HALF_UP));
-        }else{
-            //根据计划号查找该计划号下所有采购发票含税金额和不含税金额（不含税金额 = 含税金额/1.13）
-            SyCostAllocation fabriccostIncludestax = syCostAllocationMapper.queryPurBillVouchByFabric(plannum);
-
-            if(oConvertUtils.isNotEmpty(fabriccostIncludestax)){
-                syCostAllocation.setFabriccostIncludestax(fabriccostIncludestax.getFabriccostIncludestax());
-                syCostAllocation.setFabriccostNotincludestax(fabriccostIncludestax.getFabriccostNotincludestax());
-                syCostAllocation.setFabriccostIncludestaxUsd(fabriccostIncludestax.getFabriccostIncludestaxUsd());
-            }else{
-                syCostAllocation.setFabriccostIncludestax(BigDecimal.ZERO);
-                syCostAllocation.setFabriccostNotincludestax(BigDecimal.ZERO);
-                syCostAllocation.setFabriccostIncludestaxUsd(BigDecimal.ZERO);
-            }
-
         }
 
         /*如果出现多供应商的情况拼接 供应商*/
@@ -249,8 +235,11 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
 
         /*查询U8数据 面料*/
         List<SyCostAllocationFabric> list3 = syCostAllocationFabricMapper.queryByCostFabric(plannum);
+
         for (int i=0;i<list3.size();i++) {
+
             SyCostAllocationFabric Fabric = list3.get(i);
+
             /*
             1.转入：从材料出库起手，找到委外订单下使用的出库，然后关联采购排除不是自己买的；
                   -- 1.委外订单关联材料出库单，根据计划号查出所有材料出库；
@@ -335,6 +324,49 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
                 Fabric.setUsageQuantity(BigDecimal.ZERO);
             }
             Fabric.setPilosityFewer(Fabric.getUsageQuantity().subtract(Fabric.getPlanQuantity()));
+
+
+        }
+
+        //如果没有面损表信息，查询所有采购发票
+        if (syLossReport1 == null){
+            //根据计划号查找该计划号下所有采购发票含税金额和不含税金额（不含税金额 = 含税金额/1.13）
+            List<SyCostAllocation> fabriccostIncludestax = syCostAllocationMapper.queryPurBillVouchByFabric(plannum);
+            //合计面料含税成本人名币
+            BigDecimal usageQuantityTotal = BigDecimal.ZERO;
+            //合计面料不含税成本人名币
+            BigDecimal notincludestaxTotal = BigDecimal.ZERO;
+            //合计面料成本美元
+            BigDecimal includestaxTotal = BigDecimal.ZERO;
+            if(fabriccostIncludestax.size()!=0){
+
+                for(SyCostAllocation str : fabriccostIncludestax){
+
+                    for(SyCostAllocationFabric li:list3){
+                        if(str.getCInvName().equals(li.getGoodsName())){
+                            //(发票金额/发票数量)*使用数量
+                            BigDecimal money = str.getFabriccostIncludestax().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
+                            BigDecimal num = money.multiply(li.getUsageQuantity());
+                            usageQuantityTotal = usageQuantityTotal.add(num);
+                            BigDecimal money1 = str.getFabriccostNotincludestax().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
+                            BigDecimal num1 = money1.multiply(li.getUsageQuantity());
+                            notincludestaxTotal = notincludestaxTotal.add(num1);
+                            BigDecimal money2 = str.getFabriccostIncludestaxUsd().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
+                            BigDecimal num2 = money2.multiply(li.getUsageQuantity());
+                            includestaxTotal = includestaxTotal.add(num2);
+                        }
+                    }
+                }
+
+                syCostAllocation.setFabriccostIncludestax(usageQuantityTotal);
+                syCostAllocation.setFabriccostNotincludestax(notincludestaxTotal);
+                syCostAllocation.setFabriccostIncludestaxUsd(includestaxTotal);
+            }else{
+                syCostAllocation.setFabriccostIncludestax(BigDecimal.ZERO);
+                syCostAllocation.setFabriccostNotincludestax(BigDecimal.ZERO);
+                syCostAllocation.setFabriccostIncludestaxUsd(BigDecimal.ZERO);
+            }
+
         }
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/costLossReview/mapper/xml/SyCostLossReviewMapper.xml

@@ -70,9 +70,6 @@
         <if test="e.dverifyDateB !=null and e.dverifyDateB !='' and e.dverifyDateE !=null and e.dverifyDateE !=''">
             where t1.dverifyDate between #{e.dverifyDateB} and #{e.dverifyDateE}
         </if>
-        <if test="e.dverifyDateB ==null or e.dverifyDateB =='' or e.dverifyDateE ==null or e.dverifyDateE ==''">
-            where t1.dverifyDate > '2022-12-31'
-        </if>
         ORDER BY t1.dverifyDate
 
     </select>
@@ -147,9 +144,6 @@
         <if test="e.dverifyDateB !=null and e.dverifyDateB !='' and e.dverifyDateE !=null and e.dverifyDateE !=''">
             where t1.dverifyDate between #{e.dverifyDateB} and #{e.dverifyDateE}
         </if>
-        <if test="e.dverifyDateB ==null or e.dverifyDateB =='' or e.dverifyDateE ==null or e.dverifyDateE ==''">
-            where t1.dverifyDate > '2022-12-31'
-        </if>
         ) t2
 
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -656,8 +656,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         //查询U8汇率
         Map<String, Object> rate = null;
         String nflat = "";
-        String lastTime = sf.format(new Date());
-        if(oConvertUtils.isEmpty(lastTime)){
+
             SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
             String dd = sf1.format(new Date());
             String rateSplit[] = dd.split("-");
@@ -668,16 +667,6 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 nflat = rate.get("nflat").toString();
             }
 
-        }else {
-            String rateSplit[] = lastTime.split("-");
-            rate = syShippingOrderMapper.queryU8Rate(rateSplit[0], rateSplit[1]);
-            if(oConvertUtils.isEmpty(rate)){
-                nflat = "1";
-            }else{
-                nflat = rate.get("nflat").toString();
-            }
-        }
-
         int ii = 0;
         //记录运费总金额
         Double sumMoney = 0.00;
@@ -756,8 +745,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("ID", id);
                     maps.put("irowno", "1");//行号
                     maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
-                    listmaps.add(maps);
-
+                    if(imoney >= 1){
+                        listmaps.add(maps);
+                    }
 
                 }
             }
@@ -813,7 +803,9 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("cExpCode",usd.get("itemColumn"));//项目编码
                     maps.put("ID", id);
                     maps.put("irowno", "1");//行号
-                    listmaps.add(maps);
+                    if(imoney >= 1){
+                        listmaps.add(maps);
+                    }
 
 
                 }