装箱单调整

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

@@ -2274,7 +2274,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
             list.add("PCS/CTN");//英文
             list.add("PACK QTY");//英文
 
-            System.out.println("第"+num+"页");
+            System.out.println("第"+num+"页\t"+sheet.getSheetName());
             int num1=10;
             for (int x=0;x<=sheet.getLastRowNum();x++){
                 //System.out.println("sheet.getLastRowNum()\t"+sheet.getLastRowNum());

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

@@ -547,7 +547,6 @@ public class SyPackingListFabricController implements Job {
 //		 }
 		 String message="";
 		 try {
-
 			 List<SyPackingListFabric> listFabrics=syPackingListFabricService.queryByList(id);
 			 if(listFabrics.size()==0){
 				 codeMaps.put("error","未在装箱单找到对应单据");//失败信息

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/mapper/xml/SyPackingListFabricMapper.xml

@@ -188,7 +188,7 @@
 		(select tailoring_fabric_id
 		from sy_shipping_order_item
 		where sy_shipping_order_item_id=#{value }
-		and del_flag=0) and sale_Invoice_Code is null
+		and del_flag=0)
 	</select>
 
 

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

@@ -2765,7 +2765,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				if(syPackingListFabric.getRecordingCode()!=null){
 					String [] strs=syPackingListFabric.getRecordingCode().split(";");
 					for (String str : strs){
-						if(str.indexOf("103账套销售出库单")>-1){
+						if(str.indexOf("103账套销售出库单")>-1&&syPackingListFabric.getSaleInvoiceCode()==null){
 							ids.add(str.split(":")[1]);
 							syPackingListFabric.setRdrecord32Code(str.split(":")[1]);
 						}

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

@@ -2129,7 +2129,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	}
 
 	/**
-	 * 銷售發票
+	 * 銷售發票 销售发票
 	 * @param listTailorings
 	 * @param maps
 	 * @return
@@ -2204,6 +2204,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			jsonObject1.put("IEXCHRATE",order.get("iExchRate"));//汇率
 			jsonObject1.put("CEXCH_NAME",order.get("cexch_name"));//币种名称
 			jsonObject1.put("iTaxRate",order.get("iTaxRate"));//税率
+			if(account.equals("103")){
+				jsonObject1.put("iTaxRate","13.0000000000");//税率
+			}
 			if(!order.get("cexch_name").equals("人民币")){//不为人民币
 				SimpleDateFormat sf1 = new SimpleDateFormat("yyyy-M-dd");
 				String dd = sf1.format(new Date());