Merge remote-tracking branch 'origin/master'

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

@@ -167,7 +167,7 @@
 
     <select id="queryByCostHead" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,
-            max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
+             max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
             max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
             max(cc.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
             max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal,
@@ -186,7 +186,7 @@
    inner JOIN (select MOID,max(iSendQTY) as iSendQTY from UFDATA_101_2021.dbo.OM_MOMaterials GROUP BY MOID) ot on ot.MOID=om.MOID
       WHERE
                      om.iVerifyStateNew = 2  and om.cCode like CONCAT('%',#{code},'%')
-                     and (om.cCloser is null or ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )or om.cCloser='asuser')
+                     and (om.cCloser is null or om.cCloser='asuser') and ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )
                      ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode
         inner JOIN UFDATA_101_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
         inner JOIN UFDATA_101_2021.dbo.Inventory c on c.cInvCode=s.cInvCode
@@ -216,7 +216,7 @@
    inner JOIN (select MOID,max(iSendQTY) as iSendQTY from UFDATA_103_2021.dbo.OM_MOMaterials GROUP BY MOID) ot on ot.MOID=om.MOID
       WHERE
                      om.iVerifyStateNew = 2  and om.cCode like CONCAT('%',#{code},'%')
-                     and (om.cCloser is null or ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )or om.cCloser='asuser')
+                     and (om.cCloser is null or om.cCloser='asuser') and ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
         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
@@ -255,7 +255,7 @@
                      inner JOIN (select MOID,max(iSendQTY) as iSendQTY from UFDATA_103_2021.dbo.OM_MOMaterials GROUP BY MOID) ot on ot.MOID=om.MOID
                      WHERE
                      om.iVerifyStateNew = 2  and om.cCode like CONCAT('%',#{code},'%')
-                     and (om.cCloser is null or ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )or om.cCloser='asuser')
+                     and (om.cCloser is null or om.cCloser='asuser') and ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
         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
@@ -290,7 +290,7 @@
                         inner JOIN (select MOID,max(iSendQTY) as iSendQTY from UFDATA_103_2021.dbo.OM_MOMaterials GROUP BY MOID) ot on ot.MOID=om.MOID
                            WHERE
                      om.iVerifyStateNew = 2  and om.cCode like CONCAT('%',#{code},'%')
-                     and (om.cCloser is null or ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )or om.cCloser='asuser')
+                     and (om.cCloser is null or om.cCloser='asuser') and ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )
                      ) o ON a.isosid  = o.isosid AND a.cInvCode = o.cInvCode
         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
@@ -312,7 +312,7 @@
         WHERE cc.cCusCode in ('0001') and ss.cCusCode in ('T020001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
 
 
-    <!--  UNION ALL 2025-6-19注释
+     UNION ALL
 
       SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'103' as pkOrg,
           max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
@@ -333,14 +333,14 @@
  inner JOIN (select MOID,max(iSendQTY) as iSendQTY from UFDATA_103_2021.dbo.OM_MOMaterials GROUP BY MOID) ot on ot.MOID=om.MOID
     WHERE
                    om.iVerifyStateNew = 2  and om.cCode like CONCAT('%',#{code},'%')
-                   and (om.cCloser is null or ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )or om.cCloser='asuser')
+                   and (om.cCloser is null or om.cCloser='asuser') and ( (od.iReceivedQTY is not null or od.iReceivedQTY != 0) and (ot.iSendQTY is not null or ot.iSendQTY !=0) )
                    ) o ON s.isosid  = o.isosid AND s.cInvCode = o.cInvCode
       inner JOIN UFDATA_103_2021.dbo.Vendor v ON o.supplierCode= v.cVenCode
       inner JOIN UFDATA_103_2021.dbo.Inventory c on c.cInvCode=s.cInvCode
       inner JOIN UFDATA_103_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode
       inner JOIN UFDATA_103_2021.dbo.Department de ON ss.cDepCode = de.cDepCode
       inner JOIN UFDATA_103_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode
-      WHERE c.cInvCcode like '19%' GROUP BY v.cVenAbbName -->
+      WHERE c.cInvCcode like '19%' GROUP BY v.cVenAbbName
 
 
 

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

@@ -190,8 +190,13 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
         if(list.size()<=0){
             return null;
         }
-        syCostAllocation = list.get(0);
         List<String> strs3= syCostAllocationMapper.queryByCostHead3(plannum);
+        syCostAllocation = list.get(0);
+        for (SyCostAllocation syCostAllocation1 : list){
+            if (syCostAllocation1.getGarmentContractno().equals(strs3.get(0))){
+                syCostAllocation = syCostAllocation1;
+            }
+        }
 
         BigDecimal getPlanQuantity=syCostAllocationMapper.getPlanQuantity(plannum);//计划数量
         syCostAllocation.setPlanQuantity(getPlanQuantity);

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/controller/SyPackingListTailoringController.java

@@ -2130,6 +2130,7 @@ public class SyPackingListTailoringController implements Job {
 				 Map<String,Object> maps=new HashMap<>();
 				 maps.put("account",key);//账套号
 				 maps.put("account1",key);//账套号
+				 maps.put("isAhaa",codeMaps.get("isAhaa"));//账套号
 
 				 List<DictModel> dictModels=sysDictService.queryDictItemsByCode("Related_units");
 				 Map<String,List<String>> mapd=new HashMap();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/entity/PushJob.java

@@ -67,6 +67,7 @@ public class PushJob implements Job {
             codeMaps.put("time_Stuta",3);//默认为失败 清空所有失败记录就算成功
             codeMaps.put("message","");//推送成功消息
             codeMaps.put("error","");//成功
+            codeMaps.put("isAhaa",order.getIsAhaa());//成功
             if(order.getReadyFabric().equals("成衣")){
                 syPackingListTailoringController.pushInvoice(order.getId(),codeMaps);
             }else{

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/service/impl/SyPackingListTailoringServiceImpl.java

@@ -2303,29 +2303,33 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("DETAILList",jsonArrays);
 			jsonArrays1.add(jsonObject1);
 		}
-		text(jsonArrays1,"测试合并推送成衣采购发票");
-		JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"purinvoice_import");//采购发-票单
-		Map<String,String> codeMaps2 =new HashMap<>();
-		if(maps.get("account1").equals("101")||account.equals("103")){//账套只有101或者账套是103的为委外发-票
-			codeMaps2 = result(resturnJsonArrays,"委外发票",account);
+		if( account.equals(maps.get("account1").toString()) && maps.get("isAhaa").toString().equals("国内")){//国内托书的初始账套不进行推送
+
 		}else{
-			codeMaps2 = result(resturnJsonArrays,"采购发票",account);
-		}
-		for (String code1 : codeMaps.keySet()){
-			List<SyPackingListTailoring> listTailoringList=codeMaps.get(code1);
-			for (SyPackingListTailoring tailoring : listTailoringList){
-				tailoring.setRdrecord32Code(null);
-				if (codeMaps2.get(code1).indexOf("失败")>-1){
-					if(tailoring.getSaleInvoiceError()==null){
-						tailoring.setSaleInvoiceError(codeMaps2.get(code1));
-					}else{
-						tailoring.setSaleInvoiceError(tailoring.getSaleInvoiceError()+";"+codeMaps2.get(code1));
-					}
-				}else{
-					if(tailoring.getSaleInvoiceCode()==null){
-						tailoring.setSaleInvoiceCode(codeMaps2.get(code1));
+			text(jsonArrays1,"测试合并推送成衣采购发票");
+			JSONArray resturnJsonArrays = InterfaceConnUtils.doPost(jsonArrays1,"purinvoice_import");//采购发-票单
+			Map<String,String> codeMaps2 =new HashMap<>();
+			if(maps.get("account1").equals("101")||account.equals("103")){//账套只有101或者账套是103的为委外发-票
+				codeMaps2 = result(resturnJsonArrays,"委外发票",account);
+			}else{
+				codeMaps2 = result(resturnJsonArrays,"采购发票",account);
+			}
+			for (String code1 : codeMaps.keySet()){
+				List<SyPackingListTailoring> listTailoringList=codeMaps.get(code1);
+				for (SyPackingListTailoring tailoring : listTailoringList){
+					tailoring.setRdrecord32Code(null);
+					if (codeMaps2.get(code1).indexOf("失败")>-1){
+						if(tailoring.getSaleInvoiceError()==null){
+							tailoring.setSaleInvoiceError(codeMaps2.get(code1));
+						}else{
+							tailoring.setSaleInvoiceError(tailoring.getSaleInvoiceError()+";"+codeMaps2.get(code1));
+						}
 					}else{
-						tailoring.setSaleInvoiceCode(tailoring.getSaleInvoiceCode()+";"+codeMaps2.get(code1));
+						if(tailoring.getSaleInvoiceCode()==null){
+							tailoring.setSaleInvoiceCode(codeMaps2.get(code1));
+						}else{
+							tailoring.setSaleInvoiceCode(tailoring.getSaleInvoiceCode()+";"+codeMaps2.get(code1));
+						}
 					}
 				}
 			}