Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-service

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -41,9 +41,9 @@ on a.id = b.sy_pre_assembled_packing_list_id
     <insert id="syUsdAdd">
         insert into sy_usd (id, sy_letter_deposit_id, freight_forwarder, amount, item_column,del_flag)
         values
-        <foreach collection="rmbList" item="rmbList" separator=",">
+        <foreach collection="usdList" item="usdList" separator=",">
             (
-            #{rmbList.id}, #{rmbList.syLetterDepositId}, #{rmbList.freightForwarder}, #{rmbList.amount}, #{rmbList.itemColumn},0
+            #{usdList.id}, #{usdList.syLetterDepositId}, #{usdList.freightForwarder}, #{usdList.amount}, #{usdList.itemColumn},0
             )
         </foreach>
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/service/impl/SyLetterDepositServiceImpl.java

@@ -241,6 +241,13 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             List<SyLetterDepositItem> list = syLetterDeposit.getSyLetterDepositItemList();
             for (SyLetterDepositItem li:list) {
                 li.setSyPreAssembledPackingListItemId(li.getPreIds());
+
+                 //修改预装箱单主表参照状态
+                SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
+                entit.setId(li.getSyPreAssembledPackingListId());
+                entit.setIsReference(0);
+                syPreAssembledPackingListService.updateById(entit);
+
             }
             //新增
             syLetterDepositAdd(syLetterDeposit);
@@ -288,11 +295,23 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
      */
     @Override
     public int syLetterDepositDelete(String id) {
+
+        QueryWrapper<SyLetterDepositItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sy_letter_deposit_id",id).eq("del_flag",0);
+        List<SyLetterDepositItem> list = syLetterDepositItemService.list(queryWrapper);
+        for(SyLetterDepositItem li:list){
+            //修改预装箱单主表参照状态
+            SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
+            entit.setId(li.getSyPreAssembledPackingListId());
+            entit.setIsReference(0);
+            syPreAssembledPackingListService.updateById(entit);
+        }
         //删除子表
         syLetterDepositMapper.syLetterDepositItemDelete(id);
         //删除主表
         SyLetterDeposit entity =  getById(id);
         entity.setDelFlag("1");
+
         boolean boo = updateById(entity);
         if(boo){
             return 1;