托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/mapper/xml/SyShippingOrderMapper.xml

@@ -56,16 +56,16 @@
 
     <select id="queryListRmb" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyRmb">
         select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,
-         amount,itemColumn  from sy_rmb where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+         amount,item_column as itemColumn  from sy_rmb where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
     </select>
 
     <select id="queryListUsd" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyUsd">
         select id,sy_letter_deposit_id as syLetterDepositId,freight_forwarder as freightForwarder,
-         amount,itemColumn  from sy_usd where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
+         amount,item_column as itemColumn  from sy_usd where del_flag = 0 and sy_letter_deposit_id = #{syLetterDepositId}
     </select>
 
     <select id="queryItem" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
-SELECT GROUP_CONCAT(id), sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,
+SELECT GROUP_CONCAT(id) as id, sy_shipping_order_item_id as syShippingOrderItemId, english_name as englishName, style_number as styleNumber, smail_po as smailPo,
 sum(number) as number, sum(box_number) as boxNumber, sum(gross_weight) as grossWeight, sum(net_weight) as netWeight, sum(volume) as volume,
 distribution_point as distributionPoint, container_code as containerCode, container_number as containerNumber, unit_price as unitPrice, pre_shipment_date as preShipmentDate,
 salesman, operating_department as operatingDepartment, purchase_outsourcing_order_no as purchaseOutsourcingOrderNo, outsourcing_factory_for_procurement as outsourcingFactoryForProcurement,

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

@@ -141,6 +141,11 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
                         syShippingOrderItem.setNumber(itemli.getInventoryQuantity());//数量
+                        syShippingOrderItem.setReadyFabric("面料");//成衣或者面料
+                        syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
+                        syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
+                        syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
+                        syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
 
                          itemList.add(syShippingOrderItem);
 
@@ -183,6 +188,11 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                        // syShippingOrderItem.setContainerCode(lit.getCom)
                         syShippingOrderItem.setUnitPrice(lit.getUnitPrice());
                         //syShippingOrderItem.setPreShipmentDate()
+                        syShippingOrderItem.setReadyFabric("成衣");//成衣或者面料
+                        syShippingOrderItem.setContainerCode(li.getContainerCode());//集装箱代号
+                        syShippingOrderItem.setContainerNumber(li.getContainerNumber());//集装箱号
+                        syShippingOrderItem.setTailoringFabricId(li.getTailoringFabricId());//成衣或者面料主表ID
+                        syShippingOrderItem.setTailoringFabricItemId(li.getTailoringFabricItemId());//成衣或者面料子表ID
 
 
                         itemList.add(syShippingOrderItem);
@@ -241,25 +251,12 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
     @Override
     public SyShippingOrder syShippingOrderEdit(SyShippingOrder syShippingOrder) {
 
-        //修改美元信息
+        //删除美元信息
         syLetterDepositMapper.syUsdDelete(syShippingOrder.getId());
-        List<SyUsd> usdList = syShippingOrder.getUsdList();
-        for(SyUsd li:usdList){
-            li.setId(oConvertUtils.id());
-            li.setSyLetterDepositId(syShippingOrder.getId());
-            li.setDelFlag("0");
-        }
-        syLetterDepositMapper.syUsdAdd(usdList);
-        //修改人民币信息
+        //删除人民币信息
         syLetterDepositMapper.syRmbDelete(syShippingOrder.getId());
-        List<SyRmb> rmbList = syShippingOrder.getRmbList();
-        for(SyRmb li:rmbList){
-            li.setId(oConvertUtils.id());
-            li.setSyLetterDepositId(syShippingOrder.getId());
-            li.setDelFlag("0");
-        }
-        syLetterDepositMapper.syRmbAdd(rmbList);
-        //修改子表
+
+        //修改装箱单信息
         List<SyShippingOrderItem> itemList = syShippingOrder.getSyShippingOrderItemList();
         for(SyShippingOrderItem li:itemList){
 
@@ -273,9 +270,8 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 ////回写预装箱面料外销发票号, 剩余数量
                 syPackingListFabric.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
                 //箱数减去剩余数量
-                BigDecimal sub = syPackingListFabric.getQuantity().subtract(syPackingListFabric.getRemainingQuantity());
-                BigDecimal tatol = syPackingListFabric.getQuantity().subtract(sub).subtract(li.getNumber());
-                syPackingListFabric.setRemainingQuantity(tatol);
+                BigDecimal sub = syPackingListFabric.getRemainingQuantity().add(li.getNumber());
+                syPackingListFabric.setRemainingQuantity(sub);
                 syPackingListFabricService.updateById(syPackingListFabric);
 
             }else{//成衣
@@ -288,16 +284,18 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                 syPackingListTailoring.setExportInvoiceNo(syShippingOrder.getExportInvoiceNo());
                 syPackingListTailoringService.updateById(syPackingListTailoring);
             }
-            syShippingOrderItemService.updateById(li);
+            //删除子表
+            syShippingOrderItemService.removeById(li.getId());
         }
 
-        //修改主表
-        boolean boo = updateById(syShippingOrder);
+        //删除主表
+        syShippingOrder.setDelFlag("1");
+        updateById(syShippingOrder);
+
+        //新增主表
+         syShippingOrderAdd(syShippingOrder);
+         return syShippingOrder;
 
-        if(boo){
-            return syShippingOrder;
-        }
-        return null;
     }
 
     /**

jeecg-boot-module-system/src/main/java/org/jeecg/modules/openApi/service/impl/PurchaseWarehousingServiceImpl.java

@@ -256,12 +256,14 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                 itemMap.put("iPOsID", itemMap.get("moDetailId"));//采购订单行id
                                 itemMap.put("iOMoDID", "");//委外订单行id
                                 itemMap.put("POAUTOIDCOL","ID");
+
                                 rowmId = String.valueOf(itemMap.get("moDetailId"));
                                 //获取订单行的数据
                                 Map<String,Object> mapPOPodetails= this.baseMapper.getPOPodetails(rowmId);
 
                                 if(mapPOPodetails!=null){
-
+                                    //获取订单数量
+                                    itemMap.put("INQUANTITY",mapPOPodetails.get("iQuantity"));
 
                                     map.put("ipurorderid",mapPOPodetails.get("POID"));
                                     //获取订单行的价格字段
@@ -320,6 +322,8 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                                 //获取订单行数据
                                 Map<String,Object> mapOMMODetails=this.baseMapper.getOMMoDetails(rowmId);
                                 if(mapOMMODetails!=null){
+                                    //获取订单数量
+                                    itemMap.put("INQUANTITY",mapOMMODetails.get("iQuantity"));
                                     //获取订单行的价格字段
                                     getCost(itemMap,mapOMMODetails);
                                     //获取订单的自定义数据
@@ -431,6 +435,7 @@ public class PurchaseWarehousingServiceImpl extends ServiceImpl<PurchaseWarehous
                     saveItemJson.put("AUTOID_PO",m.get("moDetailId"));
                     saveItemJson.put("POAUTOIDCOL",m.get("POAUTOIDCOL"));
                     saveItemJson.put("IPROCESSCOST",m.get("iOriCost"));
+                    saveItemJson.put("INQUANTITY",m.get("INQUANTITY"));
                     //获取自定义项 自由项 批次项
                     getCDEFINEJson(saveItemJson,m);
                     itemJsonArray.add(saveItemJson);