Przeglądaj źródła

预托书调整,托书推送调整

zengtx 1 rok temu
rodzic
commit
644f4634b1

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

@@ -204,8 +204,11 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
                     preEntity.setContainerCode(li.getContainerCode());
                     //集装箱号
                     preEntity.setContainerNumber(li.getContainerNumber());
-                    //是否被参照
-                    preEntity.setIsReference(1);
+                    SyPreAssembledPackingList entity = syPreAssembledPackingListService.getById(preId);
+                    if(entity.getIsReference() != 2) {
+                        //是否被参照
+                        preEntity.setIsReference(1);
+                    }
                     syPreAssembledPackingListService.updateById(preEntity);
                 }
             }
@@ -269,10 +272,13 @@ public class SyLetterDepositServiceImpl extends ServiceImpl<SyLetterDepositMappe
             for (SyLetterDepositItem li:list) {
                 //li.setSyPreAssembledPackingListItemId(li.getPreIds());
                  //修改预装箱单主表参照状态
-                SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
-                entit.setId(li.getSyPreAssembledPackingListId());
-                entit.setIsReference(0);
-                syPreAssembledPackingListService.updateById(entit);
+                SyPreAssembledPackingList entity = syPreAssembledPackingListService.getById(li.getSyPreAssembledPackingListId());
+                if(entity.getIsReference() != 2) {
+                    SyPreAssembledPackingList entit = new SyPreAssembledPackingList();
+                    entit.setId(li.getSyPreAssembledPackingListId());
+                    entit.setIsReference(0);
+                    syPreAssembledPackingListService.updateById(entit);
+                }
 
             }
             //新增

+ 2 - 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/service/impl/SyShippingOrderServiceImpl.java

@@ -744,7 +744,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("ID", id);
                     maps.put("irowno", "1");//行号
                     maps.put("cbSysBarCode", "||SA09|"+cCode+"|"+ii);
-                    if(imoney >= 1){
+                    if(imoney >= 0.01){
                         sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
                         listmap.add(map);
                         listmaps.add(maps);
@@ -804,7 +804,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     maps.put("cExpCode",usd.get("itemColumn"));//项目编码
                     maps.put("ID", id);
                     maps.put("irowno", "1");//行号
-                    if(imoney >= 1){
+                    if(imoney >= 0.01){
                         sumImoney = sumImoney.add(new BigDecimal(df.format(imoney)));
                         listmap.add(map);
                         listmaps.add(maps);