面辅料调整

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

@@ -311,7 +311,7 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	public SyPreAssembledPackingListItem(String[] parsms,String[] parsms2,String[] parsms3){
 		//成衣工厂	款号	小po	分销点	起始箱号	结束箱号	item NO./SKU NO./UPC NO./PACKS CODE	PREACKSKU
 		//颜色	计划装箱数量	净重/箱	毛重/箱	外箱长度	外箱宽度	外箱高度	净净重	客户简称	发运明细分组ID	发运明细主表ID	申报要素ID
-		try{
+		//try{
 			garmentFactory=parsms[0];
 			styleNo=parsms[1];
 			smallPo=parsms[2];
@@ -363,9 +363,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 			this.totalNetWeight=this.boxNumber.multiply(this.netWeight);
 			this.totalGrossWeight=this.boxNumber.multiply(this.grossWeight);
 			this.totalVolume=this.boxNumber.multiply(this.outerBoxLength).multiply(this.outerBoxWidth).multiply(this.outerBoxHeight).divide(new BigDecimal(1000000));
-		}catch (Exception e){
+		/*}catch (Exception e){
 			e.printStackTrace();
-		}
+		}*/
 	}
 
 	public static boolean isNumeric(String str) {

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

@@ -32,9 +32,7 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * @Description: 预装箱单主表
@@ -652,15 +650,26 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			BigDecimal total1=new BigDecimal("0");
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
-			System.out.println("mains.size\t"+mains.size());
 			System.out.println("size\t"+main.getSyPreAssembledPackingListItemList().size());
+			String name="";
 			for (SyPreAssembledPackingListItem item :main.getSyPreAssembledPackingListItemList()){
 				System.out.println("total\t"+item.getTotal());
 				total3=total3.add(item.getTotal());
 				String ids="";
+				int num2=0;
 				for (SizeTable size : item.getSizeTables()){
-					ids+=size.getItemId()+",";//获取出运明细子表id
+					ids+=""+size.getItemId()+",";//获取出运明细子表id
+					if(num2==0){
+						SyShippingDetailsItem syshippings=syShippingDetailsItemMapper.selectById(size.getItemId());
+						if(main.getCustomerAbbreviation().equals("BW")||main.getCustomerAbbreviation().equals("DUNNES")){
+							name=syshippings.getItemNumber()+"-"+item.getSmallPo()+"-"+syshippings.getPackId();
+						}else{
+							name=syshippings.getItemNumber()+"-"+item.getSmallPo();
+						}
+
+					}
 				}
+				System.out.println("ids\t"+ids);
 				if(!ids.equals("")){
 					ids=ids.substring(0,ids.length()-1);
 					QueryWrapper queryWrapper=new QueryWrapper();
@@ -683,10 +692,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 					}
 				}
 			}
-			strs+="第"+num+"页原单据数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
+			strs+=name+"数量"+total1.intValue()+",已参照数量"+total2.intValue()+",本次数量"+total3.intValue()+"；";
 			num++;
 		}
-		System.out.println("strs\n"+strs);
 		return strs;
 	}
 

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

@@ -173,10 +173,14 @@ public class SyPackingListFabric implements Serializable {
 	@ApiModelProperty(value = "u8推送记录")
 	private String recording;
 
-	/*recording*/
+	/*isSucceed*/
 	@ApiModelProperty(value = "是否成功推送核销出库单")
 	private String isSucceed;
 
+	/*recordingCode*/
+	@ApiModelProperty(value = "u8推送单据号记录")
+	private String recordingCode;
+
 	/**业务员*/
 	@Excel(name = "业务员 Merchandiser", width = 15)
 	@ApiModelProperty(value = "业务员")

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

@@ -777,7 +777,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			BigDecimal total2=new BigDecimal("0");
 			BigDecimal total3=new BigDecimal("0");
 
-
 			String ids="";
 			String name="";
 			for (SyPackingListFabricItem item :main.getSyPackingListFabricItem()){
@@ -828,7 +827,6 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 				ids+=item.getSyShippingDetailsItemId()+",";//获取出运明细子表id
 			}
 			if(!ids.equals("")){
-
 				ids=ids.substring(0,ids.length()-1);
 				QueryWrapper queryWrapper=new QueryWrapper();
 				queryWrapper.in("id", Arrays.asList(ids.split(",")));
@@ -1493,6 +1491,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 		if(jsonObject.get("Result").equals("F")){//获取发货单是否成功添加
 			throw new JeecgBootException("账套"+account+"接口"+tableName+",原因"+ jsonObject.get("Description"));
 		}
+		if(main.getRecordingCode()!=null){
+			main.setRecordingCode(main.getRecordingCode()+";"+account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+		}else{
+			main.setRecordingCode(account+"账套"+tableName+":"+jsonObject.get("ReceiptNo"));
+		}
 		return account+"-"+index+"-"+jsonObject.get("ReceiptNo");//账套号-序号-生成的单号
 	}
 
@@ -1765,7 +1768,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 											sy1.setWidth("0");
 										}
 									}else{
-										sy1.setGramWeight("0");//设置为0
+										sy1.setWidth("0");//设置为0
 									}
 									if(sy1.getNetWeight()!=null&&sy1.getGramWeight()!=null&&sy1.getWidth()!=null){
 										BigDecimal netWeight=sy1.getNetWeight();//净重