成本报表问题调整

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

@@ -54,15 +54,15 @@
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_103_2021.dbo.rdrecords01 rs
 				join UFDATA_103_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
-						select distinct od.csocode
-						from UFDATA_103_2021.dbo.om_momain om  
-						join UFDATA_103_2021.dbo.OM_MODetails od on om.moid=od.moid
+						select od.csocode
+						from UFDATA_103_2021.dbo.PO_POmain om
+						join UFDATA_103_2021.dbo.PO_PODetails od on om.POID=od.POID
 						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},'%')
+						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') 
-				GROUP BY i.cInvName--,rs.cBatch
+						or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299') and rs.cBatch like CONCAT(#{code},'%')
+				GROUP BY i.cInvName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join 
 		(
@@ -76,7 +76,7 @@
 						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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299') and rs.cBatch like CONCAT(#{code},'%')
 				GROUP BY i.cInvName--,rs.cBatch
 		)tab2 on tab2.cInvName=tab.goodsName
 
@@ -135,15 +135,15 @@
 				select i.cInvName,sum(rs.iQuantity) as purchaseQuantity from UFDATA_101_2021.dbo.rdrecords01 rs
 				join UFDATA_101_2021.dbo.Inventory i on rs.cInvCode=i.cInvCode
 				where iordercode in (
-						select distinct od.csocode
-						from UFDATA_101_2021.dbo.om_momain om
-						join UFDATA_101_2021.dbo.OM_MODetails od on om.moid=od.moid
+						select od.csocode
+						from UFDATA_101_2021.dbo.PO_POmain om
+						join UFDATA_101_2021.dbo.PO_PODetails od on om.POID=od.POID
 						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},'%')
+						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')
-				GROUP BY i.cInvName--,rs.cBatch
+						or i.cInvCCode = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299') and rs.cBatch like CONCAT(#{code},'%')
+				GROUP BY i.cInvName
 		)tab1 on tab1.cInvName=tab.goodsName
 		left join
 		(
@@ -157,7 +157,7 @@
 						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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299') and rs.cBatch like CONCAT(#{code},'%')
 				GROUP BY i.cInvName--,rs.cBatch
 		)tab2 on tab2.cInvName=tab.goodsName
 	</select>
@@ -219,7 +219,7 @@
 				left join UFDATA_101_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
 				join UFDATA_101_2021.dbo.om_momain om on om.moid=od.moid
 				where (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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 		)tab1 on tab1.cInvName=tab.goodsName
 		 join
@@ -234,7 +234,7 @@
 						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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
 				GROUP BY i.cInvName,rs.cBatch
 		)tab2 on tab2.cInvName=tab1.cInvName and tab1.cBatch=tab2.cBatch
 		 where isnull(tab2.jian,0)-isnull(tab1.purchaseQuantity,0)>0
@@ -280,7 +280,7 @@
 				left join UFDATA_103_2021.dbo.OM_MODetails od on od.csocode=rs.iordercode
 				join UFDATA_103_2021.dbo.om_momain om on om.moid=od.moid
 				where (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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
 				GROUP BY i.cInvName,rs.cBatch,rs.iordercode
 		)tab1 on tab1.cInvName=tab.goodsName
 		 join
@@ -295,7 +295,7 @@
 						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 = '0399' or i.cInvCCode = '0499' or i.cInvCCode = '0299')
 				GROUP BY i.cInvName,rs.cBatch
 		)tab2 on tab2.cInvName=tab1.cInvName and tab1.cBatch=tab2.cBatch
 		 where isnull(tab2.jian,0)-isnull(tab1.purchaseQuantity,0)>0

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/controller/SyShippingDetailsController.java

@@ -704,15 +704,15 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 				  //boolean flag = isSpecialChar(syPreList.get(index).getDistributionPoint());
 				  //if(flag == true){
 				  if(syPreList.get(index).getDistributionPoint().contains("/")) {
-					  String disSplit[] = syPreList.get(index).getDistributionPoint().split("/");
+					  String disSplit[] = syPreList.get(index).getDistributionPointSlash().split("/");
 					  StringBuffer sbu = new StringBuffer();
 					  sbu.append(disSplit[0]);
 					  sbu.append("_");
 					  sbu.append(disSplit[1]);
-					  syPreList.get(index).setDistributionPoint(sbu.toString());
+					  syPreList.get(index).setDistributionPointSlash(sbu.toString());
 				  }
 				  //}
-				  workbook.setSheetName(index,syPreList.get(index).getItemNumber()+"-"+syPreList.get(index).getDistributionPoint()+"-"+(index+1));
+				  workbook.setSheetName(index,syPreList.get(index).getItemNumber()+"-"+syPreList.get(index).getDistributionPointSlash()+"-"+(index+1));
 				  StringBuilder builder = new StringBuilder();
 				  StringBuilder builder1 = new StringBuilder();
 				  //获取尺码组

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/entity/VO/SyPreAssembledPackingListVo.java

@@ -167,6 +167,9 @@ public class SyPreAssembledPackingListVo {
     //发运明细单据号
     private String documentNo;
 
+    //用来处理分销点导出斜杠的字段
+    private String distributionPointSlash;
+
 
     public SyPreAssembledPackingListVo(SyShippingDetailsVo syShippingDetailsVo){
 
@@ -189,6 +192,7 @@ public class SyPreAssembledPackingListVo {
         this.customer = syShippingDetailsVo.getCustomer();
         this.customerAbb = syShippingDetailsVo.getCustomerAbbreviation();
         this.elenmentId = syShippingDetailsVo.getElementsId();
+        this.distributionPointSlash = syShippingDetailsVo.getDistributionPoint();
 
     }