发运明细

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/shippingDetails/mapper/xml/SyShippingDetailsMapper.xml

@@ -5,7 +5,7 @@
     <select id="queryOrderData" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
 
         select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
-         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_text as businessTypeText,a.customer_order_number as customerOrderNumber,
+         b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_value as businessTypeText,a.customer_order_number as customerOrderNumber,
            a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,
            a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,
            b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,b.unit_price_including_tax as unitPriceIncludingTax,
@@ -68,17 +68,18 @@ ${ew.customSqlSegment}
 
     <select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
 
-        select '103' as tenantId,
-          id as accessoriesLineId,
-          id as accessoriesHeaderIdD,
-          sort as packingLineNum,
+        select
+        --'103' as tenantId,
+         -- a.id as accessoriesLineId,
+          --id as accessoriesHeaderIdD,
+          a.sort as packingLineNum,
           'T0036' as merchandiser,
-          order_number as poNo,--'PO36202206070001'
-          sy_order_data_item_id as moDetailId,
-          sy_order_data_id as poId,
-          item_number as styleNo, --'W21-W20-MSP-SPW0001'
-           'C156St2' as batchNo,
-           '藏青' as color,
+          a.order_number as poNo,--'PO36202206070001'
+          a.sy_order_data_id as moDetailId,
+           --'' as poId,
+          a.item_number as styleNo, --'W21-W20-MSP-SPW0001'
+         -- 'C156St2' as batchNo,
+           b.colour as color,
            'N0201002139' as itemCode,
            '' as itemId,
           '全涤绒布' as itemDesc,
@@ -100,13 +101,15 @@ ${ew.customSqlSegment}
           '' as supplierId,
           '' as supplierTenantId,
           '打卷' as packingMethod,
-          '染色' as treatmentMethod,
-          '1' as manualYarnFlag,
-          '0' as manualYarnUnitPrice,
-          '0' as manualYarnProportion,
-          '无' as remark,
+          a.treatment_method as treatmentMethod,
+          a.manual_yarn_flag as manualYarnFlag,
+          a.manual_yarn_unit_price as manualYarnUnitPrice,
+          a.manual_yarn_proportion as manualYarnProportion,
+          a.memo as remark,
           '111' as cabinetNum
-          from sy_shipping_details_item
+          from sy_shipping_details_item a
+          left join sy_order_data_item b
+          on a.sy_order_data_item_id = b.id
           where del_flag = 0 and shipping_details_id = #{shippingDetailsId}
     </select>