预托书修改逻辑调整

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

@@ -120,6 +120,29 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                 for (String item:itemIdSplit) {
                     stringList.add(item);
                 }
+
+                //回写预装箱单主表预托书号
+                String preId = li.getSyPreAssembledPackingListId();
+                if(oConvertUtils.isNotEmpty(preId)){
+                    SyPreAssembledPackingList preEntity = new SyPreAssembledPackingList();
+                    preEntity.setId(preId);
+                    //预托书号
+                    preEntity.setDepositaryReceiptNo(syLetterDeposit.getDepositaryReceiptNo());
+                    SyPreAssembledPackingList entity = syPreAssembledPackingListService.getById(preId);
+                    if(entity.getIsReference() != 2) {
+                        //集装箱代号
+                        preEntity.setContainerCode(li.getContainerCode());
+                        //集装箱号
+                        preEntity.setContainerNumber(li.getContainerNumber());
+                        //是否被参照
+                        preEntity.setIsReference(1);
+                    }else{
+                        if (entity.getContainerNumber()!=null){
+                            li.setContainerNumber(entity.getContainerNumber());
+                        }
+                    }
+                    syPreAssembledPackingListService.updateById(preEntity);
+                }
                 //查询预装箱单子表数据
                 QueryWrapper<SyPreAssembledPackingListItem> syPreAssembledPackingListItemQueryWrapper = new QueryWrapper<>();
                 syPreAssembledPackingListItemQueryWrapper.in("id",stringList);
@@ -193,24 +216,6 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
 //                    syshippingItem.setIsReference(1);
 //                    syShippingDetailsItemService.updateById(syshippingItem);
                 }
-                //回写预装箱单主表预托书号
-                String preId = li.getSyPreAssembledPackingListId();
-                if(oConvertUtils.isNotEmpty(preId)){
-                    SyPreAssembledPackingList preEntity = new SyPreAssembledPackingList();
-                    preEntity.setId(preId);
-                    //预托书号
-                    preEntity.setDepositaryReceiptNo(syLetterDeposit.getDepositaryReceiptNo());
-                    //集装箱代号
-                    preEntity.setContainerCode(li.getContainerCode());
-                    //集装箱号
-                    preEntity.setContainerNumber(li.getContainerNumber());
-                    SyPreAssembledPackingList entity = syPreAssembledPackingListService.getById(preId);
-                    if(entity.getIsReference() != 2) {
-                        //是否被参照
-                        preEntity.setIsReference(1);
-                    }
-                    syPreAssembledPackingListService.updateById(preEntity);
-                }
             }
             if(syLetterDepositItemList.size()!=0){
                 syLetterDepositItemService.saveBatch(syLetterDepositItemList);