面辅料回写出运明细和附件删除

jeecg-boot-module-system/src/main/java/org/jeecg/modules/splfi/controller/SyPackingListFabricController.java

@@ -55,6 +55,7 @@ import org.jeecg.modules.splfi.service.ISyPackingListFabricService;
 import org.jeecg.modules.splfi.service.ISyPackingListFabricItemService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -788,6 +789,59 @@ public class SyPackingListFabricController {
 		return result;
 	 }
 
+	 @Value(value = "${jeecg.path.upload}")
+	 private String uploadpath;
+
+	 @AutoLog(value = "附件删除")
+	 @ApiOperation(value="附件删除", notes="附件删除")
+	 @RequestMapping(value = "/deleteFile")
+	 public Result deleteFile(String fileName,String id){
+		 Result result=new Result();
+		 if(oConvertUtils.isEmpty(id)){
+			 result.setMessage("id为空");
+			 return result;
+		 }
+		 if(oConvertUtils.isEmpty(fileName)){
+			 result.setMessage("附件名为空");
+			 return result;
+		 }
+		 SyPackingListFabric syPackingListFabric=syPackingListFabricService.getById(id);
+		 if(syPackingListFabric!=null){//当成衣不为空
+			 if(syPackingListFabric.getAccessory()!=null){//
+				 List<String> accessorys=new ArrayList<>(Arrays.asList(syPackingListFabric.getAccessory().split(",")));
+				 accessorys.remove(fileName);
+
+				 if(accessorys.size()>0){
+					 String accessory="";
+					 for (String acc : accessorys){
+						 accessory+=acc+",";
+					 }
+					 syPackingListFabric.setAccessory(accessory.substring(0,accessory.length()-1));
+				 }else{
+					 syPackingListFabric.setAccessory(null);
+				 }
+				 syPackingListFabricService.updateById(syPackingListFabric);
+
+
+				 System.out.println("文件地址\n"+uploadpath+"/"+fileName);
+				 File file=new File(uploadpath+"/"+fileName);
+
+				 if (file.exists()) {
+					 if (file.delete()) {
+						 result.setMessage("已删除该文件！");
+					 }else{
+						 result.setMessage("文件删除失败!");
+					 }
+				 }else{
+					 result.setMessage("文件不存在！");
+				 }
+			 }
+		 }else{
+			 result.setMessage("数据库未找到该数据");
+		 }
+		 return result;
+	 }
+
 	 @AutoLog(value = "装箱单面辅料推送u8")
 	 @ApiOperation(value="装箱单面辅料推送u8", notes="装箱单面辅料推送u8")
 	 @GetMapping(value = "/pushBatch")

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

@@ -120,11 +120,12 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 			entity.setDelFlag("0");//新增数据设置成未删除
 			//获取该发运明细子表数据，回写剩余数量
 			SyShippingDetailsItem detailsItem=syShippingDetailsItemMapper.selectById(entity.getSyShippingDetailsItemId());
-			detailsItem.setIsReference(1);//修改成已被参照
+			//detailsItem.setIsReference(1);//修改成已被参照
 			//剩余数量-这次入库数量=新剩余数量
 			detailsItem.setSurplusQuantity(detailsItem.getSurplusQuantity().subtract(entity.getInventoryQuantity()));
 			//此次入库数量-剩余数量=超发数量
 			detailsItem.setExcessQuantity(entity.getInventoryQuantity().subtract(detailsItem.getSurplusQuantity()));
+			detailsItem.setIsReference(2);//面辅料回写
 			entity.setSalesman(detailsItem.getSalesman());//获取业务员
 			entity.setSalesDepartment(detailsItem.getSalesDepartment());//获取业务部门
 			entity.setPreDeliveryDate(detailsItem.getPreDeliveryDate());//hod
@@ -391,7 +392,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 	}
 
 	/***
-	 *
+	 * 云工厂
 	 * @param syPackingListTailorings
 	 */
 	@Override
@@ -478,7 +479,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						item.setExcessQuantity(s1.getActualDeclaredQuantity().subtract(item.getSurplusQuantity()));
 						item.setSurplusQuantity(item.getSurplusQuantity().subtract(s1.getActualDeclaredQuantity()));
 					}
-
+					item.setIsReference(2);
 					syShippingDetailsItemMapper.updateById(item);
 				}else{
 					throw new JeecgBootException("出运明细未找到对应数据");
@@ -581,6 +582,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 						item.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()).intValue());//剩余数量
 						syShippingDetailsItem.setExcessQuantity(item.getActualDeclaredQuantity().subtract(syShippingDetailsItem.getSurplusQuantity()));
 						syShippingDetailsItem.setSurplusQuantity(syShippingDetailsItem.getSurplusQuantity().subtract(item.getActualDeclaredQuantity()));
+						syShippingDetailsItem.setIsReference(2);//回写
 						syShippingDetailsItemMapper.updateById(syShippingDetailsItem);
 					}
 					syPackingListFabricItemMapper.insert(item);
@@ -1564,6 +1566,7 @@ public class SyPackingListFabricServiceImpl extends ServiceImpl<SyPackingListFab
 
 							items.add(sy1);
 							syShippingDetailsItem.setIsPull("2");//拉取成功
+							syShippingDetailsItem.setIsReference(2);//回写
 							syShippingDetailsItemMapper.updateById(syShippingDetailsItem);//修改
 						}
 						else{

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

@@ -61,6 +61,7 @@ import org.jeecg.modules.splt.service.ISyPackingListTailoringService;
 import org.jeecg.modules.splt.service.ISyPackingListTailoringItemService;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.multipart.MultipartFile;
@@ -1352,6 +1353,59 @@ public class SyPackingListTailoringController {
 		 return result;
 	 }
 
+
+	 @Value(value = "${jeecg.path.upload}")
+	 private String uploadpath;
+
+	 @AutoLog(value = "附件删除")
+	 @ApiOperation(value="附件删除", notes="附件删除")
+	 @RequestMapping(value = "/deleteFile")
+	 public Result deleteFile(String fileName,String id){
+		 Result result=new Result();
+		 if(oConvertUtils.isEmpty(id)){
+			 result.setMessage("id为空");
+			 return result;
+		 }
+		 if(oConvertUtils.isEmpty(fileName)){
+			 result.setMessage("附件名为空");
+			 return result;
+		 }
+		 SyPackingListTailoring syPackingListTailoring=syPackingListTailoringService.getById(id);
+		 if(syPackingListTailoring!=null){//当成衣不为空
+			 if(syPackingListTailoring.getAccessory()!=null){//
+				 List<String> accessorys=new ArrayList<>(Arrays.asList(syPackingListTailoring.getAccessory().split(",")));
+				 accessorys.remove(fileName);
+
+				 if(accessorys.size()>0){
+					 String accessory="";
+					 for (String acc : accessorys){
+						 accessory+=acc+",";
+					 }
+					 syPackingListTailoring.setAccessory(accessory.substring(0,accessory.length()-1));
+				 }else{
+					 syPackingListTailoring.setAccessory(null);
+				 }
+				 syPackingListTailoringService.updateById(syPackingListTailoring);
+
+				 System.out.println("文件地址\n"+uploadpath+"/"+fileName);
+				 File file=new File(uploadpath+"/"+fileName);
+				 if (file.exists()) {
+					 if (file.delete()) {
+						 result.setMessage("已删除该文件！");
+					 }else{
+						 result.setMessage("文件删除失败!");
+					 }
+				 }else{
+					 result.setMessage("文件不存在！");
+				 }
+			 }
+		 }else{
+			 result.setMessage("数据库未找到该数据");
+		 }
+		 return result;
+	 }
+
+
 	 @AutoLog(value = "调试接口-采购发票")
 	 @ApiOperation(value="调试接口-采购发票", notes="调试接口-采购发票")
 	 @RequestMapping(value = "/pushJson", method = {RequestMethod.POST})