托书加客户简称

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

@@ -187,8 +187,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     syPackingListFabric.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListFabricService.updateById(syPackingListFabric);
 
-                    //客户简称
-                    syShippingOrder.setClientAbbreviation(syPackingListFabric.getCustomerAbbreviation());
+
 
                 }else{ //成衣
                     //查询装箱单成衣子表数据
@@ -222,6 +221,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setTailoringFabricItemId(lit.getId());//成衣子表ID
                         syShippingOrderItem.setElementsId(lit.getElementsId());
                         syShippingOrderItem.setOrderNumber(lit.getOrderNumber());
+                        syShippingOrderItem.setClientAbbreviation(li.getClientAbbreviation());//客户简称
                         itemList.add(syShippingOrderItem);
 
                     }
@@ -235,8 +235,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                     syPackingListTailoring.setIsReference(1);
                     syPackingListTailoring.setShippingOrderNumber(syShippingOrder.getShippingOrderNumber());
                     syPackingListTailoringService.updateById(syPackingListTailoring);
-                    //客户简称
-                    syShippingOrder.setClientAbbreviation(syPackingListTailoring.getCustomerAbbreviation());
+
                 }
 
             }
@@ -356,9 +355,40 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
     @Override
     public void syShippingOrderItemDelete(String id) {
+
+        //回写装箱单是否被参照
+        QueryWrapper<SyShippingOrderItem> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("sy_shipping_order_item_id",id).eq("del_flag","0");
+        List<SyShippingOrderItem> list = syShippingOrderItemService.list(queryWrapper);
+        if(list.size() == 0){
+            throw new JeecgBootException("没有查询到装箱单面料数据！");
+        }
+
+        for(SyShippingOrderItem li:list){
+            if(li.getReadyFabric().equals("面料")){
+
+                //查询预装箱但面料数据
+                SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
+                if(oConvertUtils.isEmpty(syPackingListFabric)){
+                    throw new JeecgBootException("没有查询到装箱单面料数据！");
+                }
+                //回写预装箱-面料是否被参照
+                syPackingListFabric.setIsReference(0);
+                syPackingListFabricService.updateById(syPackingListFabric);
+
+            }else{//成衣
+                //回写预装箱-成衣是否被参照
+                SyPackingListTailoring syPackingListTailoring = syPackingListTailoringService.getById(li.getTailoringFabricId());
+                if(oConvertUtils.isEmpty(syPackingListTailoring)){
+                    throw new JeecgBootException("没有查询到装箱单成衣数据！");
+                }
+                syPackingListTailoring.setIsReference(0);
+                syPackingListTailoringService.updateById(syPackingListTailoring);
+            }
+        }
+
         //删除子表
         syShippingOrderMapper.syShippingOrderItemDelete(id);
-
         //删除主表
         SyShippingOrder entity = getById(id);
         entity.setDelFlag("1");