预装箱单

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

@@ -569,7 +569,7 @@ public class SyPreAssembledPackingListController extends JeecgController<SyPreAs
 					  SyPreAssembledPackingList po = new SyPreAssembledPackingList();
 					  BeanUtils.copyProperties(page, po);
 					  po.setSyPreAssembledPackingListItemList(page.getSyPreAssembledPackingListItemList());
-					  syPreAssembledPackingListService.saveMain(po);
+					  syPreAssembledPackingListService.saveMain2(po);
 				  }
 				  return Result.OK("文件导入成功！数据行数:" + list.size());
 			  } catch (Exception e) {

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

@@ -70,21 +70,21 @@ public class SyPreAssembledPackingList implements Serializable {
 	/**成衣工厂*/
 	@ApiModelProperty(value = "成衣工厂")
 	private String garmentFactory;
-	/**总箱数*/
+	/**总箱数*//*
 	@ApiModelProperty(value = "总箱数")
 	private java.math.BigDecimal totalBoxes;
-	/**总净重*/
+	*//**总净重*//*
 	@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;
+	private java.math.BigDecimal totalPrice;*/
 	/**预托书号*/
 	@ApiModelProperty(value = "预托书号")
 	private String depositaryReceiptNo;
@@ -126,6 +126,9 @@ public class SyPreAssembledPackingList implements Serializable {
 	@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
 	@ApiModelProperty(value = "预发货日期")
 	private Date preDeliveryDate;
+	/**订单类型*/
+	@ApiModelProperty(value = "订单类型")
+	private String orderType;
 /*	*//**小PO*//*
 	@ApiModelProperty(value = "小PO")
 	private String smallPo;
@@ -141,9 +144,6 @@ public class SyPreAssembledPackingList implements Serializable {
 	*//**采购/委外订单号*//*
 	@ApiModelProperty(value = "采购/委外订单号")
 	private String purOrSubOrder;*/
-	/**订单类型*/
-	@ApiModelProperty(value = "订单类型")
-	private String orderType;
 	/**工厂单价*/
 	/*@ApiModelProperty(value = "工厂单价")
 	private java.math.BigDecimal factoryUnitPrice;

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

@@ -209,6 +209,9 @@ public class SyPreAssembledPackingListItem implements Serializable {
 //	@Excel(name = "工厂单价", width = 20)
 	@ApiModelProperty(value = "工厂单价")
 	private java.math.BigDecimal factoryUnitPrice;
+//	@Excel(name = "计量单位", width = 20)
+	@ApiModelProperty(value = "计量单位")
+	private String masterMetering;
 	/**数量（按合并规则累计）*/
 //	@Excel(name = "数量（按合并规则累计）", width = 20)
 /*	@ApiModelProperty(value = "数量（按合并规则累计）")

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

@@ -44,6 +44,7 @@
 			inventory_name,
 			spur_or_sub_order,
 			factory_unit_price,
+			master_Metering,
 			/*SUM(total_quantity) total_quantity,合计数量/件数*/
 			customer_abbreviation
 		FROM  sy_pre_assembled_packing_list_item
@@ -61,18 +62,19 @@
 		 	sy_shipping_details_item.account acSetNo,/*单据号 s*/
 		 	sy_shipping_details.garment_Factory garment_Factory, /*成衣工厂*/
 			sy_shipping_details_item.distribution_point distributionPoint,/*分销点 s*/
-			factory_unit_price factoryUnitPrice,/* s*/
-			sales_Unit_Price UnitPrice,/*销售单价--> 单价*/
-			coding_Rules withCode,/*配码规则*/
+			sy_shipping_details_item.factory_unit_price factoryUnitPrice,/* s*/
+			sy_shipping_details_item.sales_Unit_Price UnitPrice,/*销售单价--> 单价*/
+			sy_order_data_item.coding_Rules withCode,/*配码规则*/
 			sy_order_data_item.size,/*尺码 s*/
 			sy_order_data_item.colour,/*颜色 s*/
+			sy_order_data_item.master_Metering,/*主计量*/
 		    sy_shipping_details_item.item_Number styleNo, /*款号 s*/
           	sy_shipping_details_item.customer_Abbreviation customerAbbreviation, /*客户简称 s*/
            	sy_shipping_details_item.distribution_Point distributionPoint, /*分销点 s*/
             sy_shipping_details_item.inventory_Name inventoryName, /*存货名称 s*/
-            sum(shipment_Quantity) total,/*数量 s*/
-            SUM(shipment_Quantity)/box_Number piecesBox,
-            box_Number boxNumber,/*箱数*/
+            sum(sy_shipping_details_item.shipment_Quantity) total,/*数量 s*/
+            SUM(sy_shipping_details_item.shipment_Quantity)/sy_order_data_item.box_Number piecesBox,
+            sy_order_data_item.box_Number boxNumber,/*箱数*/
             sy_shipping_details_item.pur_Or_Sub_Order  purOrSubOrder /*采购/委外订单号 s*/
 		 FROM sy_shipping_details
 		 LEFT JOIN sy_shipping_details_item
@@ -109,8 +111,11 @@
 
 	<!--参照发育明细获取id的所有尺码并排序-->
 	<select id="querySize" resultType="org.jeecg.modules.spapl.entity.SizeTable" >
-		SELECT sy_order_data_item.size,alias,shipment_Quantity quantity,shipment_Quantity/box_Number proportion,
-			sy_shipping_details_item.id itemId
+		SELECT 	sy_order_data_item.size,
+				sizetable.alias,
+				sy_shipping_details_item.shipment_Quantity quantity,
+				sy_shipping_details_item.shipment_Quantity/sy_order_data_item.box_Number proportion,
+				sy_shipping_details_item.id itemId
 			FROM sy_shipping_details_item
 			LEFT JOIN sy_order_data_item
 			ON sy_shipping_details_item.sy_order_data_item_id=sy_order_data_item.id

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

@@ -31,17 +31,18 @@
 			a.container_number,/*集装箱代号*/
 			a.u8_remarks,/*备注*/
 			a.garment_factory,/*成衣工厂*/
-			a.total_boxes,/*总箱数*/
-			a.total_net_weight,/*总净重*/
-			a.total_gross_weight,/*总毛重*/
-			a.total_volume,/*总体积*/
-			a.total_price,/*总价*/
 			a.depositary_receipt_no,/*预托书号*/
 			a.memo,/*备注*/
 			a.pre_delivery_date,/*预发货日期*/
 			a.order_type,/*订单类型*/
 			b.customer_abbreviation,/*客户简称*/
+			b.masterMetering,/*计量单位*/
 			SUM(b.total) total,/*件数*/
+			sum(b.box_Number) totalboxes,/*总箱数*/
+			sum(b.total_net_weight) totalnetweight,/*总净重*/
+			sum(b.total_gross_weight) totalgrossweight,/*总毛重*/
+			sum(b.total_volume) totalvolume,/*总体积*/
+			sum(b.total_price) totalprice,/*总价*/
 			/*sum(b.total) totalquantity,*/
 			b.unit_price factoryUnitPrice,/*工厂单价*/
 			b.spur_or_sub_order,/*采购委外订单号*/

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

@@ -23,12 +23,6 @@ import java.util.List;
  */
 public interface ISyPreAssembledPackingListService extends IService<SyPreAssembledPackingList> {
 
-	/**
-	 * 添加一对多
-	 * 
-	 */
-	public SyPreAssembledPackingList saveMain(SyPreAssembledPackingList syPreAssembledPackingList) ;
-
 	/**
 	 * 添加一对多
 	 *
@@ -37,12 +31,6 @@ public interface ISyPreAssembledPackingListService extends IService<SyPreAssembl
 
 	/**
 	 * 修改一对多
-	 * 
-	 */
-	public SyPreAssembledPackingList updateMain(SyPreAssembledPackingList syPreAssembledPackingList);
-
-	/**
-	 * 修改一对多2测试版
 	 *
 	 */
 	public SyPreAssembledPackingList updateMain2(SyPreAssembledPackingList syPreAssembledPackingList);

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

@@ -44,39 +44,69 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 	@Autowired
 	private SyShippingDetailsMapper syShippingDetailsMapper;
 
-	@Override
-	@Transactional
-	public SyPreAssembledPackingList saveMain(SyPreAssembledPackingList syPreAssembledPackingList) {
-		syPreAssembledPackingList.setDelFlag("0");//删除状态默认为0
-		syPreAssembledPackingList.setPushStatus("0");//推送状态默认为0
-		syPreAssembledPackingList.setStatus("0");//单据装填默认为0
+	List<SyPreAssembledPackingListItem> add(List<SyPreAssembledPackingListItem> items,String pid){
+		for (SyPreAssembledPackingListItem item : items){
+			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
+			item.setSyPreAssembledPackingListId(pid);//获取主表id
+			BigDecimal boxNumber1=item.getBoxNumber().divide(item.getPiecesBox(),2,BigDecimal.ROUND_HALF_UP);//获取箱数
+			item.setDelFlag("0");
+			for (SizeTable size : sizes){
+				SyPreAssembledPackingListItem item1=item;
+				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码箱数
+				item1.setTotal(boxNumber.multiply(item1.getPiecesBox()));//获取该尺码件数
+				item1.setBoxNumber(boxNumber);
+				item1.setTotalNetWeight(boxNumber.multiply(item1.getNetWeight()));//获取总净重		净重*箱数
+				item1.setTotalGrossWeight(boxNumber.multiply(item1.getGrossWeight()));//获取总毛重 	箱数*毛重/箱
+				//item1.setTotalNetWeight(boxNumber.multiply(new BigDecimal(size.getProportion())));//获取净净重 不知
+				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());
+				volume=volume.multiply(item1.getOuterBoxLength());
+				volume=volume.multiply(item1.getOuterBoxWidth());
+				item1.setTotalVolume(volume);//获取总体积							长*宽*高*箱数
+				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价
+				item1.setSize(size.getSize());//获取尺码
+				item1.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
+				item1.setSort(size.getNum());//获取序号
+				item1.setId(oConvertUtils.id());//获取到随机id
+				int row =syPreAssembledPackingListItemMapper.insert(item1);//添加子表数据
+			}
+		}
+		return items;
+	}
 
-		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
-		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
-		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
-		BigDecimal totalVolume=new BigDecimal(0);//总体积
-		BigDecimal totalPrice=new BigDecimal(0);//总价
-		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//添加主表数据
-		/*BigDecimal total;//总件数*/
-		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingList.getSyPreAssembledPackingListItemList()) {
-			totalBoxes=totalBoxes.add(entity.getBoxNumber());//箱数
-			totalNetWeight=totalNetWeight.add(entity.getTotalNetWeight());//总净重
-			totalGrossWeight=totalGrossWeight.add(entity.getTotalGrossWeight());//总毛重
-			totalVolume=totalVolume.add(entity.getTotalVolume());//总体积
-			totalPrice=totalPrice.add(entity.getTotalPrice());//总价
-			entity.setDelFlag("0");//默认为0
-			entity.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表的id
-			syPreAssembledPackingListItemMapper.insert(entity);//循环添加子表数据
+	List<SyPreAssembledPackingListItem> update(List<SyPreAssembledPackingListItem> items,String pid){
+		for (SyPreAssembledPackingListItem item : items){
+			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
+			BigDecimal boxNumber1=item.getBoxNumber().divide(item.getPiecesBox(),2,BigDecimal.ROUND_HALF_UP);//获取箱数
+			item.setDelFlag("0");
+			for (SizeTable size : sizes){
+				SyPreAssembledPackingListItem item1=item;
+				BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码箱数
+				item1.setSize(size.getSize());//获取尺码信息
+				item1.setTotal(boxNumber.multiply(new BigDecimal(size.getProportion())));//该尺码件数
+				item1.setTotalNetWeight(boxNumber.multiply(item1.getNetWeight()));//获取总净重		净重*箱数
+				item1.setTotalGrossWeight(boxNumber.multiply(item1.getGrossWeight()));//获取总毛重 	箱数*毛重/箱
+				//item1.setTotalNetWeight(boxNumber.multiply(new BigDecimal(size.getProportion())));//获取净净重 不知
+				BigDecimal volume=boxNumber.multiply(item1.getOuterBoxHeight());//获取体积
+				volume=volume.multiply(item1.getOuterBoxLength());
+				volume=volume.multiply(item1.getOuterBoxWidth());
+				item1.setTotalVolume(volume);//获取总体积							长*宽*高*箱数
+				item1.setTotalPrice(boxNumber.multiply(item1.getUnitPrice()));//获取总价		箱数*单价
+				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
+				item1.setId(size.getItemId());//从尺码表中获取到id
+				// 获取到发运明细子表id
+				String syDeclarationElementsItemId=syPreAssembledPackingListItemMapper.selectById(item1.getId()).getSyDeclarationElementsItemId();
+				item1.setSyDeclarationElementsItemId(syDeclarationElementsItemId);
+				int row=syPreAssembledPackingListItemMapper.updateById(item1);//如果没修改成功就是新增数据
+				if(row==0){//如果为0就添加数据
+					item1.setSyPreAssembledPackingListId(pid);
+					syPreAssembledPackingListItemMapper.insert(item1);
+				}
+			}
 		}
-		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
-		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
-		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
-		syPreAssembledPackingList.setTotalVolume(totalVolume);
-		syPreAssembledPackingList.setTotalPrice(totalPrice);
-		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
-		return syPreAssembledPackingList;
+		return items;
 	}
 
+
 	/**
 	 * 新的添加方法
 	 * @param syPreAssembledPackingList
@@ -91,97 +121,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		syPreAssembledPackingList.setPushStatus("0");//推送状态默认为0
 		syPreAssembledPackingList.setStatus("0");//单据装填默认为0
 		syPreAssembledPackingListMapper.insert(syPreAssembledPackingList);//往主表添加数据
-		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
-		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
-		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
-		BigDecimal totalVolume=new BigDecimal(0);//总体积
-		BigDecimal totalPrice=new BigDecimal(0);//总价
-		for (SyPreAssembledPackingListItem item : items){
-			totalBoxes=totalBoxes.add(item.getBoxNumber());//箱数
-			totalNetWeight=totalNetWeight.add(item.getTotalNetWeight());//总净重
-			totalGrossWeight=totalGrossWeight.add(item.getTotalGrossWeight());//总毛重
-			totalVolume=totalVolume.add(item.getTotalVolume());//总体积
-			totalPrice=totalPrice.add(item.getTotalPrice());//总价
-			System.out.println("箱数\t"+totalBoxes);
-			System.out.println("总净重\t"+totalNetWeight);
-			System.out.println("总毛重\t"+totalGrossWeight);
-			System.out.println("总体积\t"+totalVolume);
-			System.out.println("总价\t"+totalPrice);
-			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
-			BigDecimal total=item.getTotal();//总件数
-			BigDecimal piecesBox=item.getPiecesBox();//箱/件数
-			item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
-			for (SizeTable size : sizes){
-				BigDecimal quantity=total.divide(piecesBox,4,BigDecimal.ROUND_HALF_UP) ;//总件数除以每箱件数 可以获得 箱数
-				quantity=quantity.multiply(new BigDecimal(size.getProportion()));//乘以比例可获得
-				item.setTotal(quantity);//该尺码件数
-				item.setSize(size.getSize());//获取尺码信息
-				item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
-				item.setDelFlag("0");//默认为未删除
-				item.setSort(size.getNum());//序号
-				item.setId(oConvertUtils.id());//获取到随机id
-				int row =syPreAssembledPackingListItemMapper.insert(item);//添加子表数据
-				System.out.println("尺码大小：\t"+item.getSize());
-				System.out.println("尺码件数：\t"+item.getTotal());
-				System.out.println("尺码比例：\t"+size.getProportion());
-				System.out.println("预装箱单主表id\t"+syPreAssembledPackingList.getId());
-				System.out.println("发育明细主表id\t"+item.getSyDeclarationElementsId());
-				System.out.println("发运明细子表id\t"+size.getItemId()+"\n");
-				System.out.println("预装箱单子表id为"+item.getId());
-				System.out.println("插入数据库后返回消息为"+row);
-			}
+		if(syPreAssembledPackingList.getSyPreAssembledPackingListItemList()!=null){
+			add(syPreAssembledPackingList.getSyPreAssembledPackingListItemList(),syPreAssembledPackingList.getId());
 		}
-		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
-		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
-		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
-		syPreAssembledPackingList.setTotalVolume(totalVolume);
-		syPreAssembledPackingList.setTotalPrice(totalPrice);
-		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
-		return syPreAssembledPackingList;
-	}
-
-	/**
-	 * 编辑
-	 * @param syPreAssembledPackingList
-	 * @return
-	 */
-	@Override
-	@Transactional
-	public SyPreAssembledPackingList updateMain(SyPreAssembledPackingList syPreAssembledPackingList) {
-		//syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
-
-		if(!syPreAssembledPackingListMapper.selectById(syPreAssembledPackingList.getId()).getStatus().equals("0")){
-			throw new JeecgBootException("单据已提交不能修改！");
-		}
-		//1.先删除子表数据
-		syPreAssembledPackingListItemMapper.deleteByMainId(syPreAssembledPackingList.getId());//将删除状态变成1
-		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
-		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
-		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
-		BigDecimal totalVolume=new BigDecimal(0);//总体积
-		BigDecimal totalPrice=new BigDecimal(0);//总价
-		//2.子表数据重新插入
-		for(SyPreAssembledPackingListItem entity:syPreAssembledPackingList.getSyPreAssembledPackingListItemList()) {
-			//外键设置
-			//entity.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());
-			totalBoxes=totalBoxes.add(entity.getBoxNumber());//箱数
-			totalNetWeight=totalNetWeight.add(entity.getTotalNetWeight());//总净重
-			totalGrossWeight=totalGrossWeight.add(entity.getTotalGrossWeight());//总毛重
-			totalVolume=totalVolume.add(entity.getTotalVolume());//总体积
-			totalPrice=totalPrice.add(entity.getTotalPrice());//总价
-			entity.setDelFlag("0");//默认为0
-			int row=syPreAssembledPackingListItemMapper.updateById(entity);
-			if(row==0){//如果为0就添加数据
-				entity.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());
-				syPreAssembledPackingListItemMapper.insert(entity);
-			}
-		}
-		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
-		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
-		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
-		syPreAssembledPackingList.setTotalVolume(totalVolume);
-		syPreAssembledPackingList.setTotalPrice(totalPrice);
-		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
 		return syPreAssembledPackingList;
 	}
 
@@ -199,59 +141,9 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		List<SyPreAssembledPackingListItem> items=syPreAssembledPackingList.getSyPreAssembledPackingListItemList();
 		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);//修改主表数据
 		syPreAssembledPackingListItemMapper.deleteByMainId(syPreAssembledPackingList.getId());//将子表的删除状态都变成1
-		BigDecimal totalBoxes=new BigDecimal(0);//总箱数
-		BigDecimal totalNetWeight=new BigDecimal(0);//总净重
-		BigDecimal totalGrossWeight=new BigDecimal(0);//总毛重
-		BigDecimal totalVolume=new BigDecimal(0);//总体积
-		BigDecimal totalPrice=new BigDecimal(0);//总价
-		for (SyPreAssembledPackingListItem item : items){
-			List<SizeTable> sizes=item.getSizeTables();//获取尺码表信息
-			BigDecimal total=item.getTotal();//总件数
-			BigDecimal piecesBox=item.getPiecesBox();//箱/件数
-			totalBoxes=totalBoxes.add(item.getBoxNumber());//箱数
-			totalNetWeight=totalNetWeight.add(item.getTotalNetWeight());//总净重
-			totalGrossWeight=totalGrossWeight.add(item.getTotalGrossWeight());//总毛重
-			totalVolume=totalVolume.add(item.getTotalVolume());//总体积
-			totalPrice=totalPrice.add(item.getTotalPrice());//总价
-			//item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());//获取主表id
-			item.setDelFlag("0");//默认为未删除
-			int num=0;
-			for (SizeTable size : sizes){
-				BigDecimal quantity=total.divide(piecesBox,4,BigDecimal.ROUND_HALF_UP) ;//总件数除以箱/件数
-				quantity=quantity.multiply(new BigDecimal(size.getProportion()));//乘以比例可获得
-				item.setTotal(quantity);//该尺码件数
-				item.setSize(size.getSize());//获取尺码信息
-				//item.setSyDeclarationElementsItemId(size.getItemId());//获取到发运明细子表id
-				item.setSort(++num);//序号
-				item.setId(size.getItemId());//从尺码表中获取到id
-				// 获取到子表id
-				String syDeclarationElementsItemId=syPreAssembledPackingListItemMapper.selectById(item.getId()).getSyDeclarationElementsItemId();
-				item.setSyDeclarationElementsItemId(syDeclarationElementsItemId);
-				int row=syPreAssembledPackingListItemMapper.updateById(item);//如果没修改成功就是新增数据
-				if(row==0){//如果为0就添加数据
-					item.setSyPreAssembledPackingListId(syPreAssembledPackingList.getId());
-					syPreAssembledPackingListItemMapper.insert(item);
-					System.out.println("添加");
-				}else{
-					System.out.println("修改");
-				}
-				System.out.println("尺码大小：\t"+item.getSize());
-				System.out.println("尺码件数：\t"+item.getTotal());
-				System.out.println("尺码比例：\t"+size.getProportion());
-				System.out.println("预装箱单主表id\t"+syPreAssembledPackingList.getId());
-				System.out.println("发育明细主表id\t"+item.getSyDeclarationElementsId());
-				System.out.println("发运明细子表id\t"+item.getSyDeclarationElementsItemId());
-				System.out.println("预装箱单子表id为\t"+item.getId());
-				System.out.println("原子表id为\t"+size.getItemId());
-				System.out.println("返回消息为："+row+"\t0为新增，1为修改\n");
-			}
+		if(syPreAssembledPackingList.getSyPreAssembledPackingListItemList()!=null){
+			update(syPreAssembledPackingList.getSyPreAssembledPackingListItemList(),syPreAssembledPackingList.getId());
 		}
-		syPreAssembledPackingList.setTotalBoxes(totalBoxes);
-		syPreAssembledPackingList.setTotalNetWeight(totalNetWeight);
-		syPreAssembledPackingList.setTotalGrossWeight(totalGrossWeight);
-		syPreAssembledPackingList.setTotalVolume(totalVolume);
-		syPreAssembledPackingList.setTotalPrice(totalPrice);
-		syPreAssembledPackingListMapper.updateById(syPreAssembledPackingList);
 		return syPreAssembledPackingList;
 	}
 
@@ -297,8 +189,8 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 		sizes=syPreAssembledPackingListItemMapper.querySizes(id);
 		if(sizes.size()>0){
 			syPreAssembledPackingList.setSizeTables(sizes);//获取所有尺码信息
+			syPreAssembledPackingList.setSyPreAssembledPackingListItemList(list);
 		}
-		syPreAssembledPackingList.setSyPreAssembledPackingListItemList(list);
 		return syPreAssembledPackingList;
 	}
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/spapl/vo/SyPreAssembledPackingListVo.java

@@ -167,6 +167,10 @@ public class SyPreAssembledPackingListVo {
 	@ApiModelProperty(value = "工厂单价")
 	@Excel(name = "工厂单价", width = 20)
 	private java.math.BigDecimal factoryUnitPrice;
+	//**计量单位*//*
+	@ApiModelProperty(value = "计量单位")
+	@Excel(name = "计量单位", width = 20)
+	private String masterMetering;
 	//**数量（按合并规则累计）*//*
 //	@ApiModelProperty(value = "数量（按合并规则累计）")
 //	@Excel(name = "数量（按合并规则累计）", width = 20)