添加字段

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

@@ -121,4 +121,17 @@ public class SyPackingListFabric implements Serializable {
 	@TableField(exist = false)
 	@ApiModelProperty(value = "子表数据")
 	private List<SyPackingListFabricItem> syPackingListFabricItem;
+	//客户，客户简称
+	/**客户*/
+	@Excel(name = "客户", width = 15)
+	@ApiModelProperty(value = "客户")
+	private java.lang.String customer;
+	/**客户简称*/
+	@Excel(name = "客户简称", width = 15)
+	@ApiModelProperty(value = "客户简称")
+	private java.lang.String customerAbbreviation;
+	/**集装箱代号*/
+	@ApiModelProperty(value = "集装箱代号")
+	private String containerCode;
+
 }

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

@@ -249,6 +249,41 @@ public class SyPackingListFabricItem implements Serializable {
 	@ApiModelProperty(value = "申报要素ID")
 	private String elementsId;
 
+	//体积，总价
+	/**预发货日期*/
+	@Excel(name = "预发货日期", width = 20, format = "yyyy-MM-dd")
+	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+	@DateTimeFormat(pattern="yyyy-MM-dd")
+	@ApiModelProperty(value = "预发货日期")
+	private java.util.Date preDeliveryDate;
+	/**小po*/
+	@Excel(name = "小po", width = 15)
+	@ApiModelProperty(value = "小po")
+	private java.lang.String smallPo;
+	/**分销点*/
+	@Excel(name = "分销点", width = 15)
+	@ApiModelProperty(value = "分销点")
+	private String distributionPoint;
+	/**采购/委外订单号*/
+	@Excel(name = "采购/委外订单号", width = 15)
+	@ApiModelProperty(value = "采购/委外订单号")
+	private String purOrSubOrder;
+	/**订单类型*/
+	@Excel(name = "订单类型", width = 15)
+	@ApiModelProperty(value = "订单类型")
+	private String orderType;
+	/**工厂单价*/
+	@Excel(name = "工厂单价", width = 15)
+	@ApiModelProperty(value = "工厂单价")
+	private String factoryUnitPrice;
+	/**总体积*/
+	@Excel(name = "总体积", width = 15)
+	@ApiModelProperty(value = "总体积")
+	private java.math.BigDecimal totalVolume;
+	/**总价*/
+	@Excel(name = "总价", width = 15)
+	@ApiModelProperty(value = "总价")
+	private java.math.BigDecimal totalPrice;
 	/**业务部门(销售部门)*/
 	//@Excel(name = "业务部门(销售部门)", width = 15)
 	@ApiModelProperty(value = "业务部门(销售部门)")

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

@@ -56,6 +56,7 @@
 		SELECT
 			a.id syShippingDetailsId,
 			b.id syShippingDetailsItemId,
+			a.order_Type,
 			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
 			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,
 			c.master_Metering,/*主计量*/

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

@@ -69,13 +69,14 @@
    /* ORDER BY a.document_no DESC*/
     ) AS t
     ${ew.customSqlSegment}
-    order by update_time desc /*创建时间倒序*/
     </select>
 
     <select id="getSyShippingDetailsData"  resultType="org.jeecg.modules.splfi.entity.SyPackingListFabric">
         SELECT
             sy_shipping_details.id AS syDeclarationElementsId,
             sy_shipping_details_item.garment_Factory,
+            sy_shipping_details_item.customer_Abbreviation,
+            sy_shipping_details.customer,
             sy_shipping_details_item.order_Number
         FROM sy_shipping_details
         LEFT JOIN sy_shipping_details_item

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

@@ -76,6 +76,11 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
 			entity.setSalesman(detailsItem.getSalesman());//获取业务员
 			entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
+			entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
+			entity.setSmallPo(detailsItem.getSmallPo());//小po
+			entity.setDistributionPoint(detailsItem.getDistributionPoint());//分销点
+			entity.setPurOrSubOrder(detailsItem.getPurOrSubOrder());//采购委外订单号
+			entity.setFactoryUnitPrice(detailsItem.getFactoryUnitPrice());//工厂单价
 			syShippingDetailsItemMapper.updateById(detailsItem);
 			syPackingListFabricItemMapper.insert(entity);
 		}

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

@@ -187,7 +187,7 @@ public class SyPackingListTailoringController {
 				 queryWrapper.eq("a.is_Reference","2");//已被成衣装箱单参照
 			 }
 		 }else{
-			 queryWrapper.eq("a.is_Reference","1");//未被成衣装箱单参照
+			 queryWrapper.ge("a.is_Reference","1");//未被成衣装箱单参照
 		 }
 
 		 Page<SyPreAssembledPackingListVo> page = new Page<SyPreAssembledPackingListVo>(pageNo, pageSize);

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

@@ -239,7 +239,7 @@ public class SyPackingListTailoringItem implements Serializable {
 	private int isAdd;
 
 	/**采购/委外订单号*/
-	@TableField(exist = false)
+	//@TableField(exist = false)
 	@Excel(name = "采购/委外订单号", width = 15)
 	@ApiModelProperty(value = "采购/委外订单号")
 	private java.lang.String spurOrSubOrder;
@@ -290,4 +290,5 @@ public class SyPackingListTailoringItem implements Serializable {
 	//@Excel(name = "业务部门(销售部门)", width = 15)
 	@ApiModelProperty(value = "业务部门(销售部门)")
 	private java.lang.String salesDepartment;
+
 }

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

@@ -89,6 +89,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 				syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(item.getTotal()));//新剩余数量=原剩余数量-装箱单新增数量
 				item1.setSalesman(syPreItem.getSalesman());//获取业务员
 				item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
+				item1.setSpurOrSubOrder(syPreItem.getSpurOrSubOrder());//获取采购委外订单号
 				syPreAssembledPackingListItemMapper.updateById(syPreItem);//修改剩余数量
 				syPackingListTailoringItemMapper.insert(item1);//添加子表数据
 			}