预装箱单bug修复

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

@@ -112,18 +112,6 @@ public class SyPreAssembledPackingList implements Serializable {
 	//@Excel(name = "总价", width = 15)
 	@ApiModelProperty(value = "总价")
 	private java.math.BigDecimal totalPrice;
-	/**总净重*//*
-	@ApiModelProperty(value = "总净重")
-	private java.math.BigDecimal totalNetWeight;
-	*//**总毛重*//*
-	@ApiModelProperty(value = "总毛重")
-	private java.math.BigDecimal totalGrossWeight;
-	*//**总体积*//*
-	@ApiModelProperty(value = "总体积")
-	private java.math.BigDecimal totalVolume;
-	*//**总价*//*
-	@ApiModelProperty(value = "总价")
-	private java.math.BigDecimal totalPrice;*/
 	/**预托书号*/
 	@ApiModelProperty(value = "预托书号")
 	private String depositaryReceiptNo;

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

@@ -247,22 +247,25 @@ public class SyPreAssembledPackingListItem implements Serializable {
 	//@ExcelCollection(name="是否新增")
 	@ApiModelProperty(value = "是否新增")
 	private int isAdd;
-
+	//最底层供应商编码
 	@ApiModelProperty(value = "最底层供应商编码")
 	private java.lang.String supplierCode;
-
+	//最底层供应商名称
 	@ApiModelProperty(value = "最底层供应商名称")
 	private java.lang.String supplier;
-
 	//采购委外账套号
+	@ApiModelProperty(value = "采购委外账套号")
 	private java.lang.String ompoAccount;
-
-	//委外采购Id 主
+	//委外采购主表id
+	@ApiModelProperty(value = "委外采购主表id")
 	private java.lang.String ompoId;
-	//委外采购Id 子
+	//委外采购子表id
+	@ApiModelProperty(value = "委外采购子表id")
 	private java.lang.String ompoIdItem;
 	//佣金
+	@ApiModelProperty(value = "佣金")
 	private java.math.BigDecimal ymoney;
 	//订单号
+	@ApiModelProperty(value = "订单号")
 	private String orderNumber;
 }

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

@@ -28,7 +28,7 @@ public interface SyPreAssembledPackingListItemMapper extends BaseMapper<SyPreAss
 
 	public List<SizeTable> selectSize(@Param("begin") String begin,@Param("end") String end);
 
-	public List<SizeTable> querySizes(@Param("value")String value);
+	public List<SizeTable> querySizes(@Param("value")String value,@Param("groupId")String groupId);
 
 	public List<SizeTable> querySizes2(String ids);
 

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

@@ -131,8 +131,8 @@
 		WHERE shipping_details_id =#{value }
 		AND sy_shipping_details_item.size IS NOT NULL
 		and sy_shipping_details_item.del_flag=0
+		and sy_shipping_details_item.group_id=#{groupId}
 		ORDER BY sizetable.num
-
 	</select>
 
 	<!--获取所有id的所有尺码去重并排序2-->

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

@@ -24,12 +24,12 @@ public interface ISyPreAssembledPackingListItemService extends IService<SyPreAss
 	 */
 	public List<SizeTable> selectSize(String str, BigDecimal orderNum);
 
-	/**
+	/*
 	 * 获取所选中的id所有的尺码数据
 	 * @param ids
 	 * @return
 	 */
-	public List<SizeTable> querySizes(String ids);
+//	public List<SizeTable> querySizes(String ids);
 
 	public List<SizeTable> sort(List<SizeTable> sizes);
 }

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

@@ -99,9 +99,11 @@ public class SyPreAssembledPackingListItemServiceImpl extends ServiceImpl<SyPreA
 		return sizes;
 	}
 
+/*
 	public List<SizeTable> querySizes(String ids) {
-		return sort(syPreAssembledPackingListItemMapper.querySizes(ids));
+		return sort(syPreAssembledPackingListItemMapper.querySizes(ids,ids));
 	}
+*/
 
 	/**
 	 * 排序方法

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

@@ -328,7 +328,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 			item.setPlanSize(planSize);
 			item.setSizeTables(sizes);
 		}
-		sizes=syPreAssembledPackingListItemMapper.querySizes(id);
+		sizes=syPreAssembledPackingListItemMapper.querySizes(id,gqroupId);
 		if(sizes.size()>0){
 			syPreAssembledPackingList.setSizeTables(sizes);//获取所有尺码信息
 		}

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

@@ -82,7 +82,7 @@ public class SyPackingListFabricItem implements Serializable {
 	/**门幅/Width*/
     @Excel(name = "门幅/Width", width = 15)
 	@ApiModelProperty(value = "门幅/Width")
-	private java.math.BigDecimal width;
+	private String width;
 	/**匹数/Rolls*/
     @Excel(name = "匹数/Rolls", width = 15)
 	@ApiModelProperty(value = "匹数/Rolls")

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

@@ -26,7 +26,7 @@
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.order_Number,/*订单号*/
-			b.u8_Remarks memo,
+			b.u8_Remarks memo,/*备注*/
 			b.colour,/*颜色*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
@@ -61,16 +61,19 @@
 			IF(INSTR(b.pur_or_sub_order,'-')>0,LEFT(b.pur_or_sub_order,INSTR(b.pur_or_sub_order,'-')-1),b.pur_or_sub_order) PlanLotNumber,
 			/*a.declaration_Name,报关品名*/
 			c.master_Metering,/*主计量*/
-			c.Weight as gramWeight,/*克重*/
+			/*c.Weight as gramWeight,克重*/
 			b.salesman,/*业务员*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
+
 			/*b.elements_Id,申报要素*/
-			b.memo,
+			b.u8_Remarks memo,/*备注*/
 			b.inventory_Code,/*物料编码*/
 			b.inventory_Name,/*物料名称*/
 			b.material_Composition AS Composition,/*成分/Composition*/
-			b.guangpei_Gate_Width AS Width,/*门幅/Width*/
+			/*b.guangpei_Gate_Width AS Width,门幅/Width*/
+			'120cm' AS Width,/*门幅/Width*/
+			'280克' as gramWeight,/*克重*/
 			b.sales_Unit_Price AS price,/*价格*/
 			b.treatment_Method,/*处理方式*/
 			b.manual_Yarn_Flag,/*是否手册纱*/

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

@@ -470,7 +470,9 @@ public class SyPackingListTailoringController {
 	 @AutoLog(value = "获取token")
 	 @ApiOperation(value="获取token", notes="获取token")
 	 @RequestMapping(value = "/getToken", method = {RequestMethod.GET})
-	 public Result getToken(String username,String syspassword) {
+	 public Result getToken(HttpServletRequest request,String username,String syspassword) {
+		 String accessToken = request.getHeader("X-Access-Token");
+		 System.out.println("accessToken的值为:\t"+accessToken);
 		 Result result=new Result();
 		 if(redisUtil.get(CommonConstant.PREFIX_USER_TOKEN + "yungctest")!=null){
 			 result.setTimestamp(redisUtil.getExpire(CommonConstant.PREFIX_USER_TOKEN + "yungctest"));
@@ -494,9 +496,13 @@ public class SyPackingListTailoringController {
 	 @AutoLog(value = "获取当前用户")
 	 @ApiOperation(value="获取当前用户", notes="获取当前用户")
 	 @RequestMapping(value = "/getUser", method = {RequestMethod.GET})
-	 public Result getUser() {
+	 public Result getUser(HttpServletRequest request) {
+		 String accessToken = request.getHeader("X-Access-Token");
+		 System.out.println("accessToken的值为:\t"+accessToken);
+		 String username= JwtUtil.getUsername(accessToken);
+		 System.out.println("username:\t"+username);
 		 LoginUser sysUser = (LoginUser)SecurityUtils.getSubject().getPrincipal();
-		 return Result.ok(sysUser);
+		 return Result.ok(username);
 	 }
 
 	 /**
@@ -511,4 +517,19 @@ public class SyPackingListTailoringController {
 	 public SyShippingOrderItem typeConversion(@RequestBody SyPackingListTailoringItem syPackingListTailoringItem) {
 		 return syPackingListTailoringService.typeConversion(syPackingListTailoringItem);
 	 }
+
+	 @AutoLog(value = "装箱单成衣推送")
+	 @ApiOperation(value="装箱单成衣推送", notes="装箱单成衣推送")
+	 @GetMapping(value = "/pushBatch")
+	 public Result pushSplt(String[] ids) {
+		 Result result=new Result();
+		 if(oConvertUtils.isEmpty(ids)){
+			 result.setSuccess(false);
+			 result.setMessage("没有数据");
+			 return result;
+		 }
+		 result.setSuccess(true);
+		 result.setMessage("未开发完，测试用");
+		 return result;
+	 }
 }

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

@@ -125,23 +125,6 @@ public class SyPackingListTailoring implements Serializable {
 	/**预托书号*/
 	@ApiModelProperty(value = "预托书号")
 	private String depositaryReceiptNo;
-/*	*//**预发货日期*//*
-	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
-	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
-	@ApiModelProperty(value = "预发货日期")
-	private Date preDeliveryDate;
-	*//**小PO*//*
-	@ApiModelProperty(value = "小PO")
-	private String smailPo;
-	*//**分销点*//*
-	@ApiModelProperty(value = "分销点")
-	private String theDistribution;
-	*//**存货名称*//*
-	@ApiModelProperty(value = "存货名称")
-	private String nameOfTheInventory;
-	*//**颜色*//*
-	@ApiModelProperty(value = "颜色")
-	private String color;*/
 	/**采购/委外订单号*/
 	@ApiModelProperty(value = "采购/委外订单号")
 	private String purchase;
@@ -163,9 +146,6 @@ public class SyPackingListTailoring implements Serializable {
 	/**是否云工厂推送*/
 	@ApiModelProperty(value = "是否云工厂推送")
 	private String whetherCloudFactoryPush;
-/*	*//**状态*//*
-	@ApiModelProperty(value = "状态")
-	private String state;*/
 	/**附件*/
 	@ApiModelProperty(value = "附件")
 	private String accessory;
@@ -178,4 +158,28 @@ public class SyPackingListTailoring implements Serializable {
 	@ExcelCollection(name="装箱单子表")
 	@ApiModelProperty(value = "装箱单子表")
 	private List<SyPackingListTailoringItem> syPackingListTailoringItemList;
+
+
+	/**申报要素ID*/
+	@ApiModelProperty(value = "申报要素ID")
+	private String elementsId;
+
+	/**业务类型*/
+	//@Excel(name = "业务类型", width = 15)
+	@ApiModelProperty(value = "业务类型")
+	private java.lang.String businessTypeValue;
+
+	/**业务员*/
+	//@Excel(name = "业务员", width = 15)
+	@ApiModelProperty(value = "业务员")
+	private java.lang.String salesman;
+
+	/**业务部门(销售部门)*/
+	//@Excel(name = "业务部门(销售部门)", width = 15)
+	@ApiModelProperty(value = "业务部门(销售部门)")
+	private java.lang.String salesDepartment;
+
+	//委外采购Id
+	@ApiModelProperty(value = "委外采购主表Id")
+	private java.lang.String ompoId;
 }

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

@@ -54,7 +54,7 @@ public class SyPackingListTailoringItem implements Serializable {
 	/**HOD*/
     @Excel(name = "HOD", width = 15)
 	@ApiModelProperty(value = "HOD")
-	private String hod;
+	private Date hod;
 	/**STYLE NO*/
     @Excel(name = "STYLE NO", width = 15)
 	@ApiModelProperty(value = "STYLE NO")
@@ -235,4 +235,47 @@ public class SyPackingListTailoringItem implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "是否新增")
 	private int isAdd;
+
+	/**采购/委外订单号*/
+	@TableField(exist = false)
+	@Excel(name = "采购/委外订单号", width = 15)
+	@ApiModelProperty(value = "采购/委外订单号")
+	private java.lang.String spurOrSubOrder;
+
+	/**计划尺码数量汇总*/
+	//@ExcelCollection(name="计划尺码数量汇总")
+	@ApiModelProperty(value = "计划尺码数量汇总")
+	private String planSize;
+
+
+	/**区分成衣跟面辅料*/
+	@ApiModelProperty(value = "区分成衣跟面辅料")
+	private String inventoryCcode;
+
+
+	@ApiModelProperty(value = "最底层供应商编码")
+	private java.lang.String supplierCode;
+
+	@ApiModelProperty(value = "最底层供应商名称")
+	private java.lang.String supplier;
+
+	//采购委外账套号
+	@ApiModelProperty(value = "采购委外账套号")
+	private java.lang.String ompoAccount;
+
+	//委外采购主表Id
+	@ApiModelProperty(value = "委外采购主表Id")
+	private java.lang.String ompoId;
+
+	//委外采购子表Id
+	@ApiModelProperty(value = "委外采购子表Id")
+	private java.lang.String ompoIdItem;
+
+	//佣金
+	@ApiModelProperty(value = "佣金")
+	private java.math.BigDecimal ymoney;
+
+	//订单号
+	@ApiModelProperty(value = "订单号")
+	private String orderNumber;
 }

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

@@ -32,6 +32,7 @@
 			end_case_number,
 			colour,
 			pieces_box,
+			master_Metering,/*计量单位*/
 			box_number,
 			sum(total) total,/*件数*/
 			sum(total) plan_Quantity,/*计划装箱数量*/
@@ -51,11 +52,20 @@
 			small_po,
 			inventory_name,
 			spur_or_sub_order,
-			factory_unit_price,
+			factory_unit_price,/*成衣工厂*/
+			order_Number/*销售订单号号*/
+			inventory_Code,/*存货编码*/
+			inventory_Ccode,/*区分成衣跟面辅料*/
+			supplier_Code,/*最底层供应商编码*/
+			supplier,/*最底层供应商名称*/
+			ompo_Account,/*采购委外账套号*/
+			ompo_Id,/*采购委外订单主表id*/
+			ompo_Id_Item,/*采购委外订单子表id*/
+			ymoney,/*佣金*/
 			group_id
 		FROM  sy_pre_assembled_packing_list_item
 		WHERE sy_pre_assembled_packing_list_id = #{value} AND del_flag = 0
-		GROUP BY group_id/*根据发运明细主表id分组 改为了按照 颜色进行分组*/
+		GROUP BY group_id/*根据发运明细主表物料颜色 -> 改为了按照进行groupId分组*/
 	</select>
 
 	<select id="queryId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoringItem">
@@ -92,7 +102,18 @@
 		with_code,
 		inventory_name,
 		/*spur_or_sub_order,*/
-		factory_unit_price,
+		factory_unit_price,/*成衣工厂*/
+		order_Number/*销售订单号号*/
+		master_Metering,/*计量单位*/
+		inventory_Code,/*存货编码*/
+		inventory_Ccode,/*区分成衣跟面辅料*/
+		supplier_Code,/*最底层供应商编码*/
+		supplier,/*最底层供应商名称*/
+		ompo_Account,/*采购委外账套号*/
+		ompo_Id,/*采购委外订单主表id*/
+		ompo_Id_Item,/*采购委外订单子表id*/
+		ymoney,/*佣金*/
+		plan_Size,/*计划尺码数量*/
 		group_id
 	FROM  sy_packing_list_tailoring_item
 	WHERE sy_packing_list_tailoring_id =#{value} AND del_flag = 0

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

@@ -3,23 +3,35 @@
 <mapper namespace="org.jeecg.modules.splt.mapper.SyPackingListTailoringMapper">
     <select id="querySpaplId" resultType="org.jeecg.modules.splt.entity.SyPackingListTailoring">
         select
-        id syPreAssembledPackingListId,
-        order_Number,
-        item_Number,
-        product_Name,
-        size_Range,
-        customer,
-        container_Code,
-        container_Number,
-        u8_Remarks,
-        garment_Factory,
-        total_Boxes,
-        depositary_Receipt_No,
-        pre_Delivery_Date,
-        order_Type
-        from sy_pre_assembled_packing_list
+        a.id syPreAssembledPackingListId,/*预装箱单主表id*/
+        a.order_Number,/*订单号*/
+        a.item_Number,/*款号*/
+        a.product_Name,/*品名*/
+        a.size_Range,/*尺码范围*/
+        a.customer,/*客户*/
+        a.customer_Abbreviation,/*客户简称*/
+        a.spur_Or_Sub_Order purchase,/*采购/委外订单号*/
+        a.ompo_Id,/*采购/委外订单号id*/
+        a.container_Number,/*集装箱号*/
+        a.container_Code,/*集装箱代号*/
+        a.u8_Remarks,/*备注*/
+        a.depositary_Receipt_No,/*预托书号*/
+        (SELECT export_Invoice_No FROM  sy_letter_deposit
+        LEFT JOIN sy_letter_deposit_item ON
+        sy_letter_deposit.id=sy_letter_deposit_item.`sy_letter_deposit_id`
+        WHERE sy_letter_deposit_item.`sy_pre_assembled_packing_list_id`=a.id
+        LIMIT 1) exportInvoiceNo,/*外销发票号-预托书主表数据*/
+        a.salesman,/*业务员*/
+        a.sales_Department,/*业务部门(销售部门)*/
+        a.business_Type_Value,/*业务类型*/
+        a.elements_Id,/*申报要素id*/
+        order_Type /*订单类型*/
+        /*a.pre_Delivery_Date,预发货日期*/
+        /*a.total_Boxes,总箱数*/
+        /*a.garment_Factory,成衣工厂*/
+        from sy_pre_assembled_packing_list a
         where id=#{value}
-        and del_flag=0
+        and a.del_flag=0
 
     </select>
 
@@ -28,20 +40,48 @@
     </update>
     
     <select id="selectList" resultType="org.jeecg.modules.splt.vo.SyPackingListTailoringVo">
-       SELECT a.*,
+       SELECT
+         a.id,
+         a.sy_pre_assembled_packing_list_id,
+         a.document_No ,
+         a.pk_org ,
+         a.del_flag ,
+         a.order_number ,
+         a.item_number ,
+         a.product_name ,
+         a.size_range ,
+         a.customer ,
+         a.customer_abbreviation ,
+         a.container_code ,
+         a.container_number ,
+         a.export_invoice_no ,
+         a.u8_remarks,
+         a.shipping_order_number ,
+         a.depositary_receipt_no ,
+         a.purchase ,
+         a.order_type ,
+         a.the_factory_price ,
+         a.Push_state ,
+         a.status ,
+         a.cause ,
+         a.whether_cloud_factory_push ,
+         a.accessory ,
+         a.total_Boxes ,
+         a.total ,
+         a.total_Net_Weight ,
+         a.total_Gross_Weight ,
+         a.total_Volume ,
+         a.total_Price ,
+         a.elements_Id ,
          b.ac_set_no,
+         b.garment_Factory,
          b.hod,
          b.style_No,
          b.po_No,
          b.item_Code,
          b.distribution_Point,
          b.prepack_Sku,
-        /*SUM(b.total) total2,
-         sum(b.total_Net_Weight)  totalNetWeight2,
-         sum(b.total_Gross_Weight)  totalGrossWeight2,
-         sum(b.total_Volume)  totalVolume2,
-         sum(b.total_Price)  totalPrice2,*/
-         b.master_Metering,
+         b.master_Metering,/*计量单位*/
          b.inventory_Name,
          b.colour,
          b.small_Po,
@@ -51,5 +91,6 @@
          ON a.id=b.sy_packing_list_tailoring_id and b.del_flag=0
          ${ew.customSqlSegment}
          GROUP BY a.id
+         order by a.create_time
     </select>
 </mapper>

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

@@ -4,7 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem;
 import org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem;
+import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderItemMapper;
+import org.jeecg.modules.documents.syShippingOrder.mapper.SyShippingOrderMapper;
 import org.jeecg.modules.documents.syShippingOrder.service.ISyShippingOrderService;
 import org.jeecg.modules.spapl.entity.SizeTable;
 import org.jeecg.modules.spapl.entity.SyPreAssembledPackingList;
@@ -47,8 +50,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	@Autowired
 	private SyPreAssembledPackingListMapper syPreAssembledPackingListMapper;//预装箱单主表
 	@Autowired
-	private ISyShippingOrderService iSyShippingOrderService;//托书主表
-
+	private SyShippingOrderMapper syShippingOrderMapper;//托书主表
+	@Autowired
+	private SyShippingOrderItemMapper syShippingOrderItemMapper;//托书主表
 
 	BigDecimal add(List<SyPackingListTailoringItem> items,String pid){
 		BigDecimal box=new BigDecimal(0);//获取总箱数
@@ -129,6 +133,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		return box;
 	}
 
+	//获取流水号
 	String randomStr(){
 		SimpleDateFormat sf= new SimpleDateFormat("yyyyMMdd");
 		QueryWrapper<SyPackingListTailoring> queryWrapperCount=new QueryWrapper<>();
@@ -217,6 +222,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 	@Override
 	public SyPackingListTailoring querySpaplId(String id) {
 		SyPackingListTailoring syPackingListTailoring=syPackingListTailoringMapper.querySpaplId(id);
+		if(syPackingListTailoring==null){
+			return null;
+		}
 		//获得所有尺码组
 		List<SizeTable> sizes=syPreAssembledPackingListItemMapper.querySizes2(syPackingListTailoring.getSyPreAssembledPackingListId());
 		if(sizes.size()>0){
@@ -228,6 +236,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			for (SyPackingListTailoringItem item : items){
 				//循环子表获得尺码组
 				item.setSizeTables(sort(syPreAssembledPackingListItemMapper.querySize2(item.getGroupId(),item.getSyPreAssembledPackingListId())));
+				String planSize="";
+				for (SizeTable size:item.getSizeTables()){
+					planSize+=size.getSize()+":"+size.getQuantity()+"+";
+				}
+				item.setPlanSize(planSize.substring(0,planSize.length()-1));//截取最后一位+号
 			}
 			syPackingListTailoring.setSyPackingListTailoringItemList(items);
 		}
@@ -268,7 +281,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 
 	//将装箱单修改的数据覆盖给托书
 	public SyShippingOrderItem typeConversion(SyPackingListTailoringItem item){
-		SyShippingOrderItem syShippingOrderItem=new SyShippingOrderItem();
+		QueryWrapper queryWrapper=new QueryWrapper();//构造器
+		queryWrapper.eq("tailoring_fabric_item_id",item.getId());//根据子表id进行查询
+		SyShippingOrderItem syShippingOrderItem= syShippingOrderItemMapper.selectOne(queryWrapper);//获得对象
+		System.out.println("syShippingOrderItem的数据为\n"+syShippingOrderItem);
+		if(syShippingOrderItem==null){
+			return null;
+		}
 		syShippingOrderItem.setBoxNumber(item.getBoxNumber());//箱数
 		syShippingOrderItem.setVolume(item.getTotalVolume());//体积
 		syShippingOrderItem.setNumber(item.getTotal());//数量
@@ -280,11 +299,13 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		syShippingOrderItem.setUnitPrice(item.getUnitPrice());//单价
 		syShippingOrderItem.setTailoringFabricItemId(item.getId());//子表id
 		syShippingOrderItem.setTailoringFabricId(item.getSyPackingListTailoringId());//主表id
-		//syShippingOrderItem.getPreShipmentDate(item.getHod());
+		syShippingOrderItem.setPreShipmentDate(item.getHod());//发货日期
+		syShippingOrderItem.setPurchaseOutsourcingOrderNo(item.getSpurOrSubOrder());//采购/委外订单号
+		syShippingOrderItem.setReadyFabric("成衣");
+		syShippingOrderItemMapper.updateById(syShippingOrderItem);//修改
 		//syShippingOrderItem.setEnglishName();//英文名称
 		//syShippingOrderItem.setSalesman(item.getSize());//业务员
 		//syShippingOrderItem.setOperatingDepartment();//业务部门
-		//syShippingOrderItem.setPurchaseOutsourcingOrderNo();//采购/委外订单号
 		//syShippingOrderItem.setOutsourcingFactoryForProcurement();//采购/委外工厂
 		//BeanUtils.copyProperties(syPackingListTailoringItem, syShippingOrderItem);
 		return syShippingOrderItem;