托书调整

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/controller/SyShippingOrderController.java

@@ -1321,7 +1321,15 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 			 }
 		 }
 
-         int i = syShippingOrderService.saveSalePayVouchThree(map,listmap,rmbmap,usdmap);
+		 int i = 0;
+		 if(itemList.get(0).getPkOrg().equals("901")){
+			 i = syShippingOrderService.saveSalePayVouchOne(map,listmap,rmbmap,usdmap);
+		  }else if(itemList.get(0).getPkOrg().equals("902")){
+			 i = syShippingOrderService.saveSalePayVouchThree(map,listmap,rmbmap,usdmap);
+		 }else if(itemList.get(0).getPkOrg().equals("903")){
+			 i = syShippingOrderService.saveSalePayVouchThree(map,listmap,rmbmap,usdmap);
+		 }
+
          if(i>0){
          	//修改同步状态
 			 entity.setSyStuta("1");

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

@@ -49,7 +49,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
   select c.hs_code as hsCode,c.declaration_name as declarationName,a.id as id ,GROUP_CONCAT(DISTINCT b.id) as itemId,a.document_No as documentNo,a.create_by as createBy,
   a.export_invoice_no as exportInvoiceNo,a.container_number as containerNumber,a.garment_Factory as garmentFactory,
   b.supplier as supplier,a.plumbum_No as plumbumNo,a.customer_abbreviation as customerAbbreviation,b.account as acSetNo,
-  case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,sum(b.actual_declared_quantity) as number,
+  case when b.u8_Pid is null then sum(b.actual_declared_quantity) else sum(b.gross_weight) end as Total,round(sum(b.net_weight),2) as number,
    sum(b.rolls) as planQuantity,
   b.item_Number as itemNumber,b.small_Po as smallPo,round(sum(b.gross_weight),2) as grossWeight,
   round(sum(b.net_weight),2) as netWeight,'0' as totalVolume,b.distribution_Point as distributionPoint,
@@ -101,7 +101,7 @@ group by group_id order by style_number,smail_po desc
     <select id="queryEelementMerge" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrderItem">
 
 select GROUP_CONCAT(a.id) as id,b.hs_code as hsCode,b.declaration_name as declarationName,b.english_product_name as englishProductName,sum(c.meter) as meter,sum(a.number) as number,a.unit_price as unitPrice,
-round(sum(a.number*a.unit_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,a.master_metering as pcs,a.volume as volume,
+round(sum(a.number*a.unit_price),2) as totalPrice,round(sum(a.gross_weight),2) as grossWeight,round(sum(a.net_weight),2) as netWeight,'KG' as pcs,a.volume as volume,
 'USD' as curr,'CHIAN' as dree,'宁波其他/宁波象山县' as place,'照章征税' as certificate,a.style_number as styleNumber,a.smail_po as smailPo,sum(a.box_number) as boxNumber,
 a.order_number as orderNumber,a.client_abbreviation as clientAbbreviation,'CTNS' as ctns,'KGS' as kgs,'CBM' as cbm,b.declaration_unit as declarationUnit
  from sy_shipping_order_item a

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

@@ -41,8 +41,8 @@ public interface ISyShippingOrderService extends IService<SyShippingOrder> {
     public void syShippingOrderItemDelete(String id);
 
     //费用支出传U8
-    public Integer saveSalePayVouchOne(SyShippingOrder syShippingOrder);
-    public Integer saveSalePayVouchTwo(SyShippingOrder syShippingOrder);
+    public Integer saveSalePayVouchOne(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList);
+    public Integer saveSalePayVouchTwo(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList);
     public Integer saveSalePayVouchThree(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList);
 
 

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

@@ -172,7 +172,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
                         syShippingOrderItem.setCreateTime(sf.parse(createTime));
                         syShippingOrderItem.setDelFlag("0");
                         syShippingOrderItem.setStyleNumber(itemli.getItemNumber());
-                        syShippingOrderItem.setNumber(itemli.getActualDeclaredQuantity());//数量(取实际报关数量)
+                        syShippingOrderItem.setNumber(itemli.getNetWeight());//数量(取实际报关数量)，2023.1.2现在改为取净重
 
                         if(oConvertUtils.isEmpty(itemli.getU8Id())){
                             syShippingOrderItem.setReadyFabric("面料");
@@ -452,7 +452,7 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
         }
 
         for(SyShippingOrderItem li:list){
-            if(li.getReadyFabric().equals("面料")){
+            if(li.getReadyFabric().equals("面料") || li.getReadyFabric().equals("辅料")){
 
                 //查询预装箱但面料数据
                 SyPackingListFabric syPackingListFabric = syPackingListFabricService.getById(li.getTailoringFabricId());
@@ -493,17 +493,19 @@ public class SyShippingOrderServiceImpl extends ServiceImpl<SyShippingOrderMappe
 
     /**
      * 新增费用支出单
-     * @param syShippingOrder
+     * @param
      * @return
      */
     @Override
-    public Integer saveSalePayVouchOne(SyShippingOrder syShippingOrder) {
-        return 1;
+    public Integer saveSalePayVouchOne(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList) {
+        int i = this.saveSalePayVouch(map,itemList,rmbList,udsList);
+        return i;
     }
 
     @Override
-    public Integer saveSalePayVouchTwo(SyShippingOrder syShippingOrder) {
-        return 1;
+    public Integer saveSalePayVouchTwo(Map<String,Object> map,List<Map<String,Object>> itemList,List<Map<String,Object>> rmbList,List<Map<String,Object>> udsList) {
+        int i = this.saveSalePayVouch(map,itemList,rmbList,udsList);
+        return i;
     }
 
     @DS("multi-three")