Browse Source

预托书调整(预装箱单变更字段名)

zengtx 2 years ago
parent
commit
bb5d5ede66

+ 3 - 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/entity/VO/SyPreAssembledPackingListVo.java

@@ -160,4 +160,7 @@ public class SyPreAssembledPackingListVo {
     private String salesman;
     @ApiModelProperty(value = "业务部门(销售部门)")
     private String salesDepartment;
+    /**预装箱单分组ID*/
+    @ApiModelProperty(value = "预装箱单分组ID")
+    private String groupId;
 }

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/letterDeposit/mapper/xml/SyLetterDepositMapper.xml

@@ -7,7 +7,7 @@
 
 select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre_delivery_date as preDeliveryDate ,b.inventory_name as inventoryName,b.po_no as poNo,b.distribution_point as distributionPoint,
 a.memo,a.customer,b.colour,sum(b.box_number) as  boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
-sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.smail_Po as smallPo,b.unit_price as unitPrice,
+sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
 sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
 a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,
 b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,