|  | @@ -1292,11 +1292,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  				JSONObject mapItem5=new JSONObject();
 |  |  				JSONObject mapItem5=new JSONObject();
 | 
											
												
													
														|  |  				JSONObject mapItem6=new JSONObject();
 |  |  				JSONObject mapItem6=new JSONObject();
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | -				mapItem.put("CDEFINE28",item.getSmallPo());
 |  | 
 | 
											
												
													
														|  | -				mapItem3.put("CDEFINE28",item.getSmallPo());
 |  | 
 | 
											
												
													
														|  | -				mapItem4.put("CDEFINE28",item.getSmallPo());
 |  | 
 | 
											
												
													
														|  | -				mapItem5.put("CDEFINE28",item.getSmallPo());
 |  | 
 | 
											
												
													
														|  | -				mapItem6.put("CDEFINE28",item.getSmallPo());
 |  | 
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  				map.put("CACCID",mapt.get("account"));//账套号
 |  |  				map.put("CACCID",mapt.get("account"));//账套号
 | 
											
												
													
														|  |  				map3.put("CACCID",mapt.get("account"));//账套号
 |  |  				map3.put("CACCID",mapt.get("account"));//账套号
 | 
											
										
											
												
													
														|  | @@ -1512,6 +1507,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  				mapItem6.put("IQUANTITY",item.getTotal());//数量
 |  |  				mapItem6.put("IQUANTITY",item.getTotal());//数量
 | 
											
												
													
														|  |  				mapItem6.put("size",item.getSize());//根据尺码判断
 |  |  				mapItem6.put("size",item.getSize());//根据尺码判断
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  | 
 |  | +				mapItem.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  | 
 |  | +				mapItem3.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  | 
 |  | +				mapItem4.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  | 
 |  | +				mapItem5.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  | 
 |  | +				mapItem6.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  | 
 |  | +
 | 
											
												
													
														|  |  				mapItems.add(mapItem);
 |  |  				mapItems.add(mapItem);
 | 
											
												
													
														|  |  				mapItems3.add(mapItem3);
 |  |  				mapItems3.add(mapItem3);
 | 
											
												
													
														|  |  				mapItems4.add(mapItem4);
 |  |  				mapItems4.add(mapItem4);
 | 
											
										
											
												
													
														|  | @@ -2101,7 +2103,6 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  				jsonObject.put("IQUANTITY",item.getTotal());//净重
 |  |  				jsonObject.put("IQUANTITY",item.getTotal());//净重
 | 
											
												
													
														|  |  				jsonObject.put("size",item.getSize());//尺码
 |  |  				jsonObject.put("size",item.getSize());//尺码
 | 
											
												
													
														|  |  				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
 |  |  				jsonObject.put("CINVCODE",item.getInventoryCode());//存货编码
 | 
											
												
													
														|  | -				jsonObject.put("CDEFINE28",item.getSmallPo());//小po
 |  | 
 | 
											
												
													
														|  |  				jsonObject.put("POAUTOIDCOL","Autoid");//对应类型
 |  |  				jsonObject.put("POAUTOIDCOL","Autoid");//对应类型
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  				String istc2=item.getIsTc();
 |  |  				String istc2=item.getIsTc();
 | 
											
										
											
												
													
														|  | @@ -2129,6 +2130,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  							jsonObject.put("IORITAXCOST",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 |  |  							jsonObject.put("IORITAXCOST",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 | 
											
												
													
														|  |  						}
 |  |  						}
 | 
											
												
													
														|  |  						getcFree(jsonObject,map);
 |  |  						getcFree(jsonObject,map);
 | 
											
												
													
														|  | 
 |  | +						jsonObject.put("CDEFINE28",item.getSmallPo());//小po
 | 
											
												
													
														|  |  						break;
 |  |  						break;
 | 
											
												
													
														|  |  					}
 |  |  					}
 | 
											
												
													
														|  |  				}
 |  |  				}
 | 
											
										
											
												
													
														|  | @@ -2326,6 +2328,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 | 
											
												
													
														|  |  						autoIds.add(map.get("AutoID"));
 |  |  						autoIds.add(map.get("AutoID"));
 | 
											
												
													
														|  |  						jsonObject.put("AUTOID_DIS",map.get("AutoID"));
 |  |  						jsonObject.put("AUTOID_DIS",map.get("AutoID"));
 | 
											
												
													
														|  |  						getcFree(jsonObject,map);
 |  |  						getcFree(jsonObject,map);
 | 
											
												
													
														|  | 
 |  | +						jsonObject.put("CDEFINE28",item.getSmallPo());
 | 
											
												
													
														|  |  						if(item.getAcSetNo().equals("102")&&account.equals("102")){
 |  |  						if(item.getAcSetNo().equals("102")&&account.equals("102")){
 | 
											
												
													
														|  |  							jsonObject.put("ITAXUNITPRICE",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 |  |  							jsonObject.put("ITAXUNITPRICE",item.getCustomsDeclarationUnitPrice());//改成使用报关单价
 | 
											
												
													
														|  |  						}
 |  |  						}
 |