装箱单添加报关单价

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

@@ -324,4 +324,9 @@ public class SyPackingListFabricItem implements Serializable {
 	@Excel(name = "区分成衣跟面辅料", width = 15)
 	@ApiModelProperty(value = "区分成衣跟面辅料")
 	private String inventoryCcode;
+
+	/**报关单价*/
+	@Excel(name = "报关单价", width = 15)
+	@ApiModelProperty(value = "报关单价")
+	private java.math.BigDecimal customsDeclarationUnitPrice;
 }

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

@@ -74,10 +74,12 @@
 			b.supplier,/*获取供应商*/
 			a.order_Type,
 			(select declaration_Name from sy_declaration_elements where id=b.elements_Id) as declaration_Name,
+			b.customs_declaration_unit_price,
 			IF(INSTR(b.order_number,'-')>0,LEFT(b.order_number,INSTR(b.order_number,'-')-1),b.order_number) PlanLotNumber,
 			c.master_Metering,/*主计量*/
 			b.salesman,/*业务员*/
 			b.sales_Department,/*业务部门*/
+		    b.factory_Unit_Price,/*工厂单价*/
 			b.item_Number,/*款号*/
 			b.colour,/*颜色*/
 			b.u8_Remarks memo,/*备注*/

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

@@ -300,6 +300,11 @@ public class SyPackingListTailoringItem implements Serializable {
 	@ApiModelProperty(value = "申报要素ID")
 	private String elementsId;
 
+	/**报关单价*/
+	@Excel(name = "报关单价", width = 15)
+	@ApiModelProperty(value = "报关单价")
+	private java.math.BigDecimal customsDeclarationUnitPrice;
+
 	public SyPackingListTailoringItem(){
 
 	}

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

@@ -53,7 +53,8 @@
 			inventory_name,
 			spur_or_sub_order,
 			factory_unit_price,/*成衣工厂*/
-			order_Number/*销售订单号号*/
+			order_Number,/*销售订单号号*/
+			customs_declaration_unit_price,/*报关单价*/
 			inventory_Code,/*存货编码*/
 			inventory_Ccode,/*区分成衣跟面辅料*/
 			supplier_Code,/*最底层供应商编码*/

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

@@ -252,14 +252,14 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 		syPackingListTailoringItemMapper.deleteByMainId(id);
 		syPackingListTailoringMapper.deleteByMainId(id);
-		QueryWrapper queryWrapper=new QueryWrapper();
+	/*	QueryWrapper queryWrapper=new QueryWrapper();
 		queryWrapper.eq("tailoring_Fabric_Id",id);//条件
 		SyShippingOrderItem syShippingOrderItem=syShippingOrderItemMapper.selectOne(queryWrapper);
 		if(syShippingOrderItem==null){//判断托书是否已经参照
 			return;
-		}
+		}*/
 		//根据成衣装箱单主表id修改为
-		UpdateWrapper updateWrapper=new UpdateWrapper<>();
+		/*UpdateWrapper updateWrapper=new UpdateWrapper<>();
 		updateWrapper.eq("tailoring_Fabric_Id",id);//条件
 		updateWrapper.set("del_flag","1");//修改为已删除
 		syShippingOrderItemMapper.update(null,updateWrapper);//修改
@@ -272,7 +272,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			updateWrapper.eq("id",syShippingOrderItem.getSyShippingOrderItemId());//条件
 			updateWrapper.set("del_flag","1");//修改为已删除
 			syShippingOrderMapper.update(null,updateWrapper);
-		}
+		}*/
 	}
 
 	@Override