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

@@ -744,25 +744,6 @@
 		and 出库计划单号!=#{code}
 	</select>
 
-	<!--	面料余下数量链接方法-->
-<!--	<select id="queryRemainingByFabric4" resultType="org.jeecg.modules.cost.entity.SyRemaining">
-		select cinvname as goodsName,a.*
-		from (SELECT cinvcode,cfree1 as color,
-		出库计划单号 planCode,
-		本款入库数量-总出库数量 number
-		FROM TimeberwordFunction.DBO.invoke101_v1
-		union all
-		SELECT cinvcode,cfree1 as color,
-		出库计划单号 planCode,
-		本款入库数量-总出库数量 number
-		FROM TimeberwordFunction.DBO.invoke103_v1 ) a
-		inner join Inventory b
-		on a.cInvCode=b.cinvcode
-		WHERE planCode like CONCAT('%',#{code},'%')
-		and number>0;
-	</select>-->
-
-
 	<select id="queryTransferByFabric4" resultType="org.jeecg.modules.cost.entity.SyTransfer">
 		SELECT cinvname AS goodsName, a.* FROM (
 		SELECT cinvcode as cinvcode, cfree1 AS color,
@@ -779,7 +760,7 @@
 	</select>
 
 	<!--	面料余下数量链接方法-->
-	<select id="queryRemainingByFabric4停用" resultType="org.jeecg.modules.cost.entity.SyRemaining">
+	<select id="queryRemainingByFabric4" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 		SELECT cinvname AS goodsName, a.* FROM (
 		SELECT icinvcode as cinvcode, cfree1 AS color,
 		转入计划单号 planCode2,出库计划单号 planCode,
@@ -795,7 +776,7 @@
 	</select>
 
 	<!--	面料余下数量链接方法-->
-	<select id="queryRemainingByFabric4" resultType="org.jeecg.modules.cost.entity.SyRemaining">
+	<select id="queryRemainingByFabric4停用" resultType="org.jeecg.modules.cost.entity.SyRemaining">
 		SELECT cinvname AS goodsName, a.* FROM (
 		SELECT icinvcode as cinvcode,
 		cfree1 AS color,转入计划单号 planCode2,

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

@@ -16,6 +16,154 @@
         </if>
         limit #{pageStart},#{pageEnd}
     </select>
+    <select id="queryByCostHeadx" 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(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,
+            sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity
+        FROM  UFDATA_101_2021.dbo.SO_SODetails s
+        inner JOIN UFDATA_101_2021.dbo.SO_SOMain ss on ss.ID= s.ID
+
+        inner JOIN (
+                     SELECT
+                     om.cCode AS omCode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_101_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_101_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+   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')
+                     ) 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
+        inner JOIN UFDATA_101_2021.dbo.Person  pe ON ss.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_101_2021.dbo.Department de ON ss.cDepCode = de.cDepCode
+        inner JOIN UFDATA_101_2021.dbo.Customer cc ON ss.cCusCode = cc.cCusCode
+        WHERE c.cInvCcode like '19%' GROUP BY v.cVenAbbName
+
+        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,
+            max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
+            max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
+            max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal,
+            sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity
+        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
+                     om.cCode AS omCode, od.csoordercode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_103_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+   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')
+                     ) 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
+        inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_103_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_103_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode
+        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_102_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode
+        inner JOIN UFDATA_102_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode
+        WHERE cc.cCusCode in ('T020001','0001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
+
+
+        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,
+            max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
+            max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
+            max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal,
+            sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity
+        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
+                     om.cCode AS omCode, od.csoordercode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_103_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+                     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')
+                     ) 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
+        inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_103_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_103_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode
+        inner join UFDATA_101_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        inner join UFDATA_101_2021.dbo.po_podetails g on g.POID=f.POID and g.ivouchrowno=a.iRowNo
+        inner join UFDATA_101_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        inner join UFDATA_101_2021.dbo.so_somain ss on ss.id=s.id
+        inner join UFDATA_101_2021.dbo.Person j on j.cPersonCode=ss.cPersonCode
+        inner JOIN UFDATA_101_2021.dbo.Customer cu ON ss.cCusCode = cu.cCusCode
+        WHERE cc.cCusCode in ('T020001') and ss.cCusCode not in ('T020001','0001') and c.cInvCcode like '19%' GROUP BY v.cVenAbbName
+     UNION ALL
+
+
+             SELECT max(ss1.iExchRate) as exchangeRate,min(s1.iTaxUnitPrice) as soPrice,'103' as pkOrg,
+            max(o.omCode) as planNum,max(s1.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
+            max(ss1.cSOCode) as garmentContractno,max(de.cDepName) as department,
+            max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
+            max(ss1.iTaxRate) as taxrate,max(ss1.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal,
+            sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity
+        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
+                     om.cCode AS omCode, od.csoordercode,
+                     om.MOID AS ompoId,od.MODetailsID AS ompoIdItem,
+                     om.cVenCode AS supplierCode,od.cInvCode,od.isosid,od.iQuantity
+                     FROM
+                     UFDATA_103_2021.dbo.OM_MOMain om
+                     inner JOIN UFDATA_103_2021.dbo.OM_MODetails od ON om.MOID = od.MOID
+                        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')
+                     ) 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
+        inner JOIN UFDATA_103_2021.dbo.Person  pe ON b.cPersonCode = pe.cPersonCode
+        inner JOIN UFDATA_103_2021.dbo.Department de ON b.cDepCode = de.cDepCode
+        inner JOIN UFDATA_103_2021.dbo.Customer cc ON b.cCusCode = cc.cCusCode
+        left join UFDATA_102_2021.dbo.PO_Pomain f on f.cPOID=o.csoordercode
+        left join UFDATA_102_2021.dbo.po_podetails g on g.POID=f.POID and g.ivouchrowno=a.iRowNo
+        left join UFDATA_102_2021.dbo.SO_SODetails s on s.iSOsID=g.iorderdid
+        left join UFDATA_102_2021.dbo.so_somain ss on ss.id=s.id
+
+				left join UFDATA_101_2021.dbo.PO_Pomain f1 on f1.cPOID=ss.csocode
+        left join UFDATA_101_2021.dbo.po_podetails g1 on g1.POID=f1.POID and g1.ivouchrowno=s.iRowNo
+        left join UFDATA_101_2021.dbo.SO_SODetails s1 on s1.iSOsID=g1.iorderdid
+        left join UFDATA_101_2021.dbo.so_somain ss1 on ss1.id=s1.id
+
+        left join UFDATA_101_2021.dbo.Person j on j.cPersonCode=ss1.cPersonCode
+        left JOIN UFDATA_101_2021.dbo.Customer cu ON ss1.cCusCode = cu.cCusCode
+        WHERE cc.cCusCode in ('0001') and ss.cCusCode in ('T020001') and c.cInvCcode like '19%'
+		GROUP BY v.cVenAbbName;
+
+    </select>
 
     <select id="queryByCostHead" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,

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

@@ -485,15 +485,19 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
                             goodsName=goodsName.substring(0,goodsName.indexOf("--"));
                         }
                         if(str.getCInvName().equals(goodsName)){
-                            if (str.getInvoiceQuantity().compareTo(li.getUsageQuantity())!=0){
+                            BigDecimal quantity=li.getUsageQuantity();
+                            if (li.getFabrictransferQuantity()!=null){
+                                quantity=li.getUsageQuantity().subtract(li.getFabrictransferQuantity());
+                            }
+                            if (str.getInvoiceQuantity().compareTo(quantity)!=0){
                                 BigDecimal money = str.getFabriccostIncludestax().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal num = money.multiply(li.getUsageQuantity());
+                                BigDecimal num = money.multiply(quantity);
                                 usageQuantityTotal = usageQuantityTotal.add(num);
                                 BigDecimal money1 = str.getFabriccostNotincludestax().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal num1 = money1.multiply(li.getUsageQuantity());
+                                BigDecimal num1 = money1.multiply(quantity);
                                 notincludestaxTotal = notincludestaxTotal.add(num1);
                                 BigDecimal money2 = str.getFabriccostIncludestaxUsd().divide(str.getInvoiceQuantity(),2,BigDecimal.ROUND_HALF_UP);
-                                BigDecimal num2 = money2.multiply(li.getUsageQuantity());
+                                BigDecimal num2 = money2.multiply(quantity);
                                 includestaxTotal = includestaxTotal.add(num2);
                             }else{
                                 usageQuantityTotal = usageQuantityTotal.add(str.getFabriccostIncludestax());

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -627,7 +627,7 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 			 List<SyLetterDepositItem> list = syLetterDepositMapper.printItem(id);
 			 //集合转map
 			 for(SyLetterDepositItem li:list){
-
+				 li.setEnglishName(li.getEnglishName().trim());
 				 totalGrossWeight = totalGrossWeight.add(li.getTotalGrossWeight());
 				 totalNetweight = totalNetweight.add(li.getTotalNetWeight());
 				 tatolNumber  = tatolNumber.add(li.getTotal());

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

@@ -997,7 +997,6 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
 					  }
 					  //判断重复自由项数据
 					  String key = generateKey(li);
-					  System.out.println("出运明细key:\t"+key);
 					  if (seenData.contains(key)) {
 						  result.setSuccess(false);
 						  result.setMessage("有重复数据，无法提交");
@@ -1067,7 +1066,7 @@ public class SyShippingDetailsController extends JeecgController<SyShippingDetai
   	 //处理拼接
 	 private String generateKey(SyShippingDetailsItem item) {
 		 // 根据需要拼接一个唯一标识字符串，用于比较
-		 return item.getGroupId()+item.getPackId()+item.getSmallPo() + item.getOrderNumber() + item.getPreDeliveryDate() + item.getPreCompletionDate()
+		 return item.getGroupId()+item.getSmallPo() + item.getOrderNumber() + item.getPreDeliveryDate() + item.getPreCompletionDate()
 				 + item.getItemNumber() + item.getInventoryCode() + item.getColour() + item.getSize()
 				 + item.getGuangpeiGateWidth() + item.getWeight() + item.getCodingRules();
 	 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/report/controller/FabricLossController.java

@@ -304,7 +304,7 @@ public class FabricLossController {
 				syFabricLossReportService.updateById(fabricLossReport);
 				result.success("");
 			}else{
-				result.error500("计划号："+ccode+"不存在");
+				result.error500("面损表列表中未保存，计划号："+ccode);
 			}
 		}catch (Exception ex){
 			ex.printStackTrace();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/controller/SyPreAssembledPackingListController.java

@@ -1713,8 +1713,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                         cell.setCellValue(args1[i]);
                         cell.setCellStyle(cellStyle);
                     }
-                    else if(i>5+list.getSizeTables().size()&&i<12+list.getSizeTables().size()){
-//                        System.out.println("args1[i-list.getSizeTables().size()]\t"+args1[i-list.getSizeTables().size()]);
+                    else if(i>5+list.getSizeTables().size()&&i<14+list.getSizeTables().size()){
                         cell.setCellValue(args1[i-list.getSizeTables().size()]);
                         cell.setCellStyle(cellStyle);
                     }
@@ -2406,6 +2405,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
                     if(x==0){
                         //System.out.println("cell.getstring\t"+cell.getStringCellValue());
                         if((i>7&&i<num1-18-4)||i==num1-4){
+//                            System.out.println("页签cell\t"+cell+"\t行   "+i+"  num1  "+num1);
                             strs3.add(cell.getStringCellValue());
                         }
                         if(list.contains(cell.getStringCellValue())){

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingList.java

@@ -286,7 +286,11 @@ public class SyPreAssembledPackingList implements Serializable {
 				"KICKBACK:"+","+
 				ymoney+ ","+
 				"MERCHANDISER:"+ ","+
-				salesman+ ",_____"+
+				salesman+ ","+
+				"客户简称:"+ ","+
+				customerAbbreviation+
+
+				",_____"+
 
 				"HOD:"+ ","+
 				hod+ ","+

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/entity/SyPreAssembledPackingListItem.java

@@ -393,6 +393,8 @@ public class SyPreAssembledPackingListItem implements Serializable {
 				SizeTable sizeTable=new SizeTable();
 				sizeTable.setSize(parsms3[i]);//尺码
 				int box=0;
+//				System.out.print("(parsms3[i]\t"+parsms3[i]);
+//				System.out.println("\tparsms2[i]\t"+parsms2[i]);
 				if(isNumeric(parsms2[i])){//
 					box=((Double)Double.parseDouble(parsms2[i])).intValue();
 				}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/mapper/xml/SyPreAssembledPackingListMapper.xml

@@ -390,6 +390,7 @@
     <select id="queryById2" resultType="org.jeecg.modules.spapl.entity.SyPreAssembledPackingList" parameterType="java.lang.String">
         SELECT
         a.item_Number item_Number,
+        a.customer_Abbreviation,
         b.salesman salesman,
         b.small_Po order_Number,
         d.inventory_Currency_Name inventory_Currency_Name,

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/service/impl/SyPreAssembledPackingListServiceImpl.java

@@ -1024,6 +1024,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						}
 					}
 				}
+//				System.out.println("未找到配码规格getWithCode\t"+item.getWithCode()+"\t未找到配码规格分组id\t"+item.getGroupItemId()+"\t对应尺码\t"+item.getSize());
 				if (bool){
 					throw new JeecgBootException("未找到配码规格\t"+item.getWithCode());
 				}

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -813,7 +813,11 @@ public class SyPackingListFabricController implements Job {
 						 itemStrs.add("");
 					 }
 				 }
-				 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs.toArray(new String[itemStrs.size()]),x+1);
+				 List<String> itemStrs1=new ArrayList<>();
+				 itemStrs.forEach(m->{
+					 itemStrs1.add(clearStr(m));
+				 });
+				 SyPackingListFabricItem syPackingListFabricItem=new SyPackingListFabricItem(itemStrs1.toArray(new String[itemStrs1.size()]),x+1);
 				 items.add(syPackingListFabricItem);
 			 }
 		 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/entity/SyPackingListFabricItem.java

@@ -427,6 +427,11 @@ public class SyPackingListFabricItem implements Serializable {
 		supplier=strs[12];//供应商(印厂)
 		specificationAndModel=strs[13];//规格型号
 		masterMetering=strs[14];//单位
+		if(strs[15]!=null&&strs[15].indexOf(" ")>-1){
+			dyelotNumber=strs[15].replace(" ","");//去空格
+		}else{
+			dyelotNumber=strs[15];
+		}
 		dyelotNumber=strs[15];//缸号
 		if(strs[16]==null||strs[16].equals("")){
 			rolls=new BigDecimal(0);//匹数

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/service/impl/SyPackingListFabricServiceImpl.java

@@ -1442,6 +1442,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				map.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				mapt.put("CVENCODE",orderData.get("cvencode"));//供应商编码
 				map5.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码（如果传空，取来源单据）
+				map5.put("CBUSTYPE",orderData.get("cBusType"));//业务类型（如果传空，取来源单据）
 				map5.put("CEXCH_NAME",orderData.get("cexchname"));//CEXCH_NAME 币种名称
 				map5.put("IEXCHRATE",orderData.get("nflat"));//汇率（如果传空，接口默认1）cPayCode
 				map.put("IEXCHRATE",orderData.get("nflat"));//汇率
@@ -1905,7 +1906,9 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 //			e.printStackTrace();
 //		}
 		String recording=null;
-		if(main.getRecording()!=null&&main.getRecording().indexOf(",")>-1){
+//		if(main.getRecording()!=null&&main.getRecording().indexOf("1")>-1){
+//		if(main.getRecording()!=null&&main.getRecording().indexOf(",")>-1){
+		if(main.getRecording()!=null){
 			String[] recordings=main.getRecording().split(",");
 			Map<String,Map<String,String>> maps=new HashMap<>();
 			for (int i=0;i<recordings.length;i++){
@@ -2023,6 +2026,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		}
 
 		redisUtil.set("pushsno001", pushsno001);//采购委外入库单
+		text(mapList,mapt.get("ordertype")+"入库单");
 		JSONArray resturn1 = InterfaceConnUtils.doPost(mapList,"purchasein_import");//采购入库单
 		recording=result(main,resturn1,mapt.get("ordertype")+"入库单",((Map) mapList.get(0)).get("CACCID").toString(),"1");//采购入库单
 		recording(main,recording);
@@ -2153,7 +2157,8 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	 * @param recording
 	 */
 	public void recording(SyPackingListFabric syPackingListTailoring,String recording){
-		if(syPackingListTailoring.getRecording()!=null&&syPackingListTailoring.getRecording().indexOf(",")>-1){
+//		if(syPackingListTailoring.getRecording()!=null&&syPackingListTailoring.getRecording().indexOf(",")>-1){
+		if(syPackingListTailoring.getRecording()!=null){
 			String[] recordings=syPackingListTailoring.getRecording().split(",");
 			Map<String,Map<String,String>> maps=new HashMap<>();
 			for (int i=0;i<recordings.length;i++){
@@ -2456,6 +2461,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							"cMaker!='进出口平台管理员' "+
 							"and (cWhCode='PT0004' "+//面料
 							"or cWhCode='PT0005') "+//辅料
+							"and (f.cSCloser is null or f.cSCloser='asuser')  " +
 							"and cCusCode='T020001' and\n" +
 							" a.ID  = "+sy.getU8Id().substring(3,sy.getU8Id().length());//查询主表全部拉取
 					List<Map<String, Object>> list = new ArrayList<>();

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splt/mapper/xml/syPackingListTailoringMapper.xml

@@ -276,7 +276,7 @@
     </select>
 
     <select id="getOmOrPo" parameterType="java.lang.String" resultType="java.util.HashMap">
-        select cvencode,nflat,cPayCode,${id} as id,cexch_name as cexchname  from ${tableName}
+        select cvencode,nflat,cPayCode,${id} as id,cexch_name as cexchname,cBusType  from ${tableName}
         where  ${orderName}
     </select>
 

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

@@ -2207,7 +2207,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("CDEFINE4",syPackingListTailoring.getTheFinalShippingDate().substring(0,10));//最终船期
 			jsonObject1.put("CDEFINE6",syPackingListTailoring.getTheFinalShippingDate2().substring(0,10));//合同日期
 			jsonObject1.put("CDEFINE10",syPackingListTailoring.getShippingOrderNumber());//托书号
-			String	venName=syPackingListTailoringMapper.getCvenName3(syPackingListTailoring.getRdrecord32Code());
+			String venName=syPackingListTailoringMapper.getCvenName3(syPackingListTailoring.getRdrecord32Code());
 			if (venName==null){
 				venName=syPackingListTailoringMapper.getCvenName4(syPackingListTailoring.getRdrecord32Code());
 			}
@@ -2218,6 +2218,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			if (orderData.containsKey("cPayCode")){
 				jsonObject1.put("CPAYCODE",orderData.get("cPayCode"));//付款条件编码
 			}
+			if (orderData.containsKey("cBusType")){
+				jsonObject1.put("CBUSTYPE",orderData.get("cBusType"));//业务类型
+			}
 			jsonObject1.put("IEXCHRATE",orderData.get("nflat"));//汇率
 			jsonObject1.put("CEXCH_NAME",orderData.get("cexchname"));//币种名称
 
@@ -2440,8 +2443,8 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				jsonObject.put("CBMEMO",item.getMemo());//备注
 				for (Map<String,Object> map : invoices){
 					if(Double.parseDouble(map.get("iQuantity").toString())==Double.parseDouble(jsonObject.get("IQUANTITY").toString())&&
-							map.get("cInvCode").toString().equalsIgnoreCase(item.getInventoryCode()) &&map.get("cFree2").equals(item.getSize())
-							&&!autoIds.contains(map.get("AutoID"))){
+						map.get("cInvCode").toString().equalsIgnoreCase(item.getInventoryCode()) &&map.get("cFree2").equals(item.getSize())
+						&&!autoIds.contains(map.get("AutoID"))){
 						autoIds.add(map.get("AutoID"));
 						jsonObject.put("AUTOID_DIS",map.get("AutoID"));
 						getcFree(jsonObject,map);