成衣添加packid

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

@@ -195,6 +195,10 @@ public class SyPreAssembledPackingListItem implements Serializable {
   //  @Excel(name = "组织", width = 15)
 	@ApiModelProperty(value = "组织")
 	private String pkOrg;
+	/**packId*/
+	@Excel(name = "packId", width = 15)
+	@ApiModelProperty(value = "packId")
+	private java.lang.String packId;
 	/**删除状态*/
  //   @Excel(name = "删除状态", width = 15)
 	@ApiModelProperty(value = "删除状态")

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

@@ -94,6 +94,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 				item1.setId(oConvertUtils.id());//获取到随机id
 				//获取发育明细数据
 				SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
+				item1.setPackId(syItem.getPackId());
 				item1.setOmpoIdItem(syItem.getOmpoIdItem());//获取委外/采购订单子表Id
 				item1.setOmpoId(syItem.getOmpoId());//获取委外/采购订单主表Id
 				item1.setOmpoAccount(syItem.getOmpoAccount());//采购委外账套号
@@ -567,6 +568,7 @@ public class SyPreAssembledPackingListServiceImpl extends ServiceImpl<SyPreAssem
 						SyShippingDetailsItem syItem=syShippingDetailsItemMapper.selectById(item1.getSyDeclarationElementsItemId());
 						if(syItem!=null){
 							System.out.println(item1.getSize()+"\t"+item1.getSyDeclarationElementsItemId());
+							item1.setPackId(syItem.getPackId());
 							item1.setUnitPrice(syItem.getSalesUnitPrice());//获取销售单价
 							item1.setFactoryUnitPrice(new BigDecimal(syItem.getFactoryUnitPrice()==null?"0":syItem.getFactoryUnitPrice()));//工厂单价
 							item1.setInventoryName(syItem.getInventoryName());//存货名称

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

@@ -1371,6 +1371,8 @@ public class SyPackingListTailoringController {
 	 @RequestMapping(value = "/deleteFile")
 	 public Result deleteFile(String fileName,String id){
 		 Result result=new Result();
+		 result.setSuccess(false);
+		 result.setCode(500);
 		 if(oConvertUtils.isEmpty(id)){
 			 result.setMessage("id为空");
 			 return result;
@@ -1399,6 +1401,8 @@ public class SyPackingListTailoringController {
 				 File file=new File(uploadpath+"/"+fileName);
 				 if (file.exists()) {
 					 if (file.delete()) {
+						 result.setCode(200);
+						 result.setSuccess(true);
 						 result.setMessage("已删除该文件！");
 					 }else{
 						 result.setMessage("文件删除失败!");

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

@@ -241,7 +241,10 @@ public class SyPackingListTailoringItem implements Serializable {
 	@ApiModelProperty(value = "工厂单价")
 	private BigDecimal factoryUnitPrice;
 
-
+	/**packId*/
+	@Excel(name = "packId", width = 15)
+	@ApiModelProperty(value = "packId")
+	private java.lang.String packId;
 
 	/**是否新增*/
 	@TableField(exist = false)

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

@@ -161,7 +161,6 @@ 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());//获取尺码
@@ -176,6 +175,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 					if(item1.getFactoryUnitPrice()!=null){
 						item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价
 					}
+					item1.setPackId(syPreItem.getPackId());//packid
 					item1.setSalesDepartment(syPreItem.getSalesDepartment());//获取业务部门
 					item1.setSyOrderDataId(syPreItem.getSyOrderDataId());//订单数据主表id
 					item1.setSyOrderDataItemId(syPreItem.getSyOrderDataItemId());//订单数据子表id
@@ -263,7 +263,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 			s1.setInventoryCcode(syPreAssembledPackingListItem.getInventoryCcode());//物料分类
 			s1.setWithCode(syPreAssembledPackingListItem.getWithCode());//配码规则
 			s1.setOmpoAccount(syPreAssembledPackingListItem.getOmpoAccount());//采购委外账套号
-
+			s1.setPackId(syPreAssembledPackingListItem.getPackId());
 			s1.setSupplier(syPreAssembledPackingListItem.getSupplier());
 			s1.setSupplierCode(syPreAssembledPackingListItem.getSupplierCode());
 			s1.setYmoney(syPreAssembledPackingListItem.getYmoney());//佣金
@@ -588,7 +588,7 @@ public class SyPackingListTailoringServiceImpl extends ServiceImpl<SyPackingList
 							item1.setUnitPrice(syPreItem.getUnitPrice());//获取单价
 							item1.setHod(new SimpleDateFormat("yyyy-MM-dd").parse(syPreItem.getHod()));//预发货日期
 							item1.setWithCode(syPreItem.getWithCode());
-
+							item1.setPackId(syPreItem.getPackId());
 							item1.setUnitPrice(syPreItem.getUnitPrice());//获取销售单价
 							if(item1.getFactoryUnitPrice()!=null){
 								item1.setFactoryUnitPrice(syPreItem.getFactoryUnitPrice());//工厂单价