楚江ERP-发货明细列表数据调整

@@ -337,19 +337,16 @@ public class ShipmentsOrderInfoController extends DefaultBaseController {
                 if (StringUtils.isNotBlank(latex)) {
                     LatexFormulaExcelExporterUtil.insertLatexImageToCell(workbook, sheet, latex, startRow, 4, 1, 7);
                 }
-                // 处理订单类型
-                String orderType = handleContractType(detail.getContractType());
-
                 ExcelUtil.setCellValue(sheet, startRow, 9, detail.getQuantity());
                 if ("TYPE_2".equals(type)) {
                     ExcelUtil.setCellValue(sheet, startRow, 10, detail.getActualShipmentQuantity());
                     ExcelUtil.setCellValue(sheet, startRow, 11, detail.getNum());
                     ExcelUtil.setCellValue(sheet, startRow, 12, detail.getSalesPrice());
-                    ExcelUtil.setCellValue(sheet, startRow, 13, orderType);
+                    ExcelUtil.setCellValue(sheet, startRow, 13, detail.getOrderType());
                     ExcelUtil.setCellValue(sheet, startRow, 14, detail.getYieldBatchNo());
                 } else {
                     ExcelUtil.setCellValue(sheet, startRow, 13, detail.getPackagingFee());
-                    ExcelUtil.setCellValue(sheet, startRow, 15, orderType);
+                    ExcelUtil.setCellValue(sheet, startRow, 15, detail.getOrderType());
                 }
                 startRow++;
             }

@@ -76,12 +76,6 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String packagingFee;
 
     /**
-     * 合同类型
-     */
-    @TableField(exist = false)
-    private String contractType;
-
-    /**
      * 客户ID
      */
     @TableField(exist = false)

@@ -44,8 +44,10 @@
                 ELSE '其它'
                 END AS order_type,
             o.ordering_unit AS customer_id,
+            o.packaging_fee,
             c.name AS customer_name,
             tb.order_spec_id,
+            ol.brand,
             ol.thickness,
             ol.thickness_tol_pos,
             ol.thickness_tol_neg,
@@ -56,11 +58,15 @@
             ol.length_tol_pos,
             ol.length_tol_neg,
             ol.quantity,
+            ol.sales_price,
+            ol.status,
             tb.parent_id,
-            tb.status,
             tb.shipments_date,
             tb.shipments_time,
             tb.can_shipments,
+            tb.actual_shipment_quantity,
+            tb.num,
+            tb.yield_batch_no,
             tb.del_flag,
             ws.name AS workshop_name,
             tb.create_by_id,
@@ -196,7 +202,12 @@
             o.delivery_method,
             o.settlement_terms,
             o.packaging_fee,
-            sc.type as contract_type,
+            CASE
+                WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
+                WHEN sc.type IN ('INTL_STD_CONTRACT', 'INTL_INVENTORY_AGMT', 'INTL_OPEN_SPEC_AGMT') THEN '外贸'
+                WHEN sc.type = 'PROCESS_STD_AGMT' THEN '加工'
+            ELSE '其它'
+            END AS order_type,
             c.name AS customer_name,
             tb.order_spec_id,
             ol.brand,
@@ -211,8 +222,8 @@
             ol.length_tol_neg,
             ol.quantity,
             ol.sales_price,
+            ol.status,
             tb.parent_id,
-            tb.status,
             tb.shipments_date,
             tb.shipments_time,
             tb.can_shipments,