预托书修改，表体删行校验

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/mapper/xml/SyCostAllocationShipdetailMapper.xml

@@ -40,7 +40,7 @@ left join
 (select sbv.cDefine10,sum(sbvs.iQuantity) as iQuantity,sbvs.cInvCode,sbvs.cFree1,sbvs.cFree2,min(sbv.dDate) as dDate,max(sbv.iExchRate) as iExchRate,sbv.cSOCode as cSOCode,max(sbvs.iTaxUnitPrice) AS exportUnitPrice,sum(sbvs.iSum) as exportPrice,sum(sbvs.iNatSum) as rmbAmount,max(sbv.cexch_name) as cexch_name
 from UFDATA_101_2021.dbo.SaleBillVouchs sbvs  left join UFDATA_101_2021.dbo.SaleBillVouch sbv on   sbv.SBVID=sbvs.SBVID
 group by  sbv.cDefine10,sbvs.cInvCode,sbvs.cFree1,sbvs.cFree2,sbv.cSOCode
-) as sbv on sbv.cInvCode=pbv.cInvCode and sbv.cFree1=pbv.cFree1 and sbv.cFree2=pbv.cFree2 and pbv.iQuantity=sbv.iQuantity -- 自由项+合计数量做匹配
+) as sbv on sbv.cInvCode=pbv.cInvCode and sbv.cFree1=pbv.cFree1 and sbv.cFree2=pbv.cFree2 and pbv.iQuantity=sbv.iQuantity and pbv.cDefine10 = sbv.cDefine10 -- 自由项+合计数量做匹配
 LEFT JOIN UFDATA_101_2021.dbo.Vendor v ON pbv.cVenCode= v.cVenCode
 GROUP BY sbv.cDefine10,sbv.iExchRate,sbv.cSOCode
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/cost/service/impl/SyCostAllocationServiceImpl.java

@@ -325,6 +325,9 @@ public class SyCostAllocationServiceImpl extends ServiceImpl<SyCostAllocationMap
             Fabric.setPilosityFewer(Fabric.getUsageQuantity().subtract(Fabric.getPlanQuantity()));
 
 
+            //单耗件= 使用数量/表头计划数量
+            Fabric.setUnitConsumption(Fabric.getUsageQuantity().divide(syCostAllocation.getPlanQuantity(),4,BigDecimal.ROUND_HALF_UP));
+
         }
 
         //如果没有面损表信息，查询所有采购发票

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/controller/SyLetterDepositController.java

@@ -741,4 +741,36 @@ public class SyLetterDepositController extends JeecgController<SyLetterDeposit,
 	 }
 
 
+	 /**
+	  * 预托书修改，删行时查询有没有下游数据
+	  * @param syLetterDeposit
+	  * @return
+	  */
+	 @PostMapping(value = "/deleteQuery")
+	 public Result<Integer> deleteQuery(@RequestBody SyLetterDeposit syLetterDeposit){
+
+		 Result<Integer> result =new Result<Integer>();
+
+         List<String> tailoringItems = new ArrayList<>();
+		 String split[] = syLetterDeposit.getId().split(",");
+		 for(String str:split){
+			 tailoringItems.add(str);
+		 }
+
+		 //查询下游装箱单成衣
+		 QueryWrapper<SyPackingListTailoringItem> queryWrapper = new QueryWrapper<>();
+		 queryWrapper.in("sy_Pre_Assembled_Packing_List_Item_Id",tailoringItems);
+		 List<SyPackingListTailoringItem> list = syPackingListTailoringItemService.list(queryWrapper);
+		 if(list.size()!=0){
+		 	result.setMessage("该记录下游有单据，不允许删除！");
+		 	result.setSuccess(false);
+		 	result.setResult(1);
+		 	return result;
+		 }
+		 result.setMessage("删除成功!");
+		 result.setSuccess(true);
+		 result.setResult(0);
+		 return result;
+	 }
+
   }