补充工厂单价

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

@@ -203,7 +203,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 			entity.setInventoryQuantity(entity.getActualDeclaredQuantity());//入库数量=实际报关数量
 			if(entity.getIsAdd()>0){//大于1就是新增数据
-				//因为云工厂得修改时得停止调用前面接口
+				//因为云工场得修改时得停止调用前面接口
 				/*SyShippingDetailsItem s1 =syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
 				//剩余数量-这次入库数量=新剩余数量
 				s1.setSurplusQuantity(s1.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
@@ -437,6 +437,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					s1.setAccount(item.getAccount());//账套号
 					s1.setPurOrSubOrder(item.getPurOrSubOrder());//委外采购订单
 					s1.setOrderNumber(item.getOrderNumber());//订单号
+					s1.setFactoryUnitPrice(item.getFactoryUnitPrice());//工厂单价
 
 					if((s1.getInventoryCcode().indexOf("03")!=-1&&!s1.getInventoryCcode().equals("0399")) ||
 							(s1.getInventoryCcode().indexOf("02")!=-1&&!s1.getInventoryCcode().equals("0299"))||
@@ -544,6 +545,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 					item.setInventoryName(syShippingDetailsItem.getInventoryName());//存货名称(辅料名称)
 					item.setComposition(syShippingDetailsItem.getInventoryName());//成分/Composition
 					item.setDelFlag("0");//是否删除
+					item.setFactoryUnitPrice(syShippingDetailsItem.getFactoryUnitPrice());
 					item.setSyPackingListFabricId(syPackingListFabric.getId());
 					item.setOrderNumber(syShippingDetailsItem.getOrderNumber());
 					if((syShippingDetailsItem.getInventoryCcode().indexOf("03")!=-1&&!syShippingDetailsItem.getInventoryCcode().equals("0399")) ||
@@ -1502,6 +1504,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 							sy1.setSupplierPrintingPlant(syShippingDetailsItem.getSupplier());//供应商编码
 							sy1.setSupplierCodePrintingPlant(syShippingDetailsItem.getSupplierCode());//供应商
 							sy1.setSyShippingDetailsId(syShippingDetailsItem.getShippingDetailsId());//出运明细主表id
+							sy1.setFactoryUnitPrice(syShippingDetailsItem.getFactoryUnitPrice());
 							if(sy1.getMasterMetering()==null){
 								sy1.setMasterMetering(syShippingDetailsItem.getMasterMetering());
 							}

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

@@ -161,6 +161,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					BigDecimal boxNumber=boxNumber1.multiply(new BigDecimal(size.getProportion()));//获取该尺码件数
 					item1.setTotal(boxNumber);//该尺码件数
 
+
 					item1.setActualPackingQty(boxNumber);
 					item1.setPlanQuantity(size.getQuantity());//计划装箱数量
 					item1.setSize(size.getSize());//获取尺码
@@ -172,6 +173,9 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					syPreItem.setRemainingQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber));//新剩余数量=原剩余数量-装箱单新增数量
 					syPreItem.setExcessQuantity(syPreItem.getRemainingQuantity().subtract(boxNumber).negate());
 					item1.setSalesman(syPreItem.getSalesman());//获取业务员
+					if(item1.getFactoryUnitPrice()!=null){
+						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
+					}
 					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
@@ -519,6 +523,11 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 		}
 	}
 
+	/**
+	 * excel
+	 * @param mains
+	 * @return
+	 */
 	@Override
 	@Transactional
 	public boolean excelAdd(List<SyPackingListTailoring> mains) {