托书调整

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

@@ -291,7 +291,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder,
 
 	  QueryWrapper<SyPackingList> queryWrapper = QueryGenerator.initQueryWrapper(syPackingList, request.getParameterMap());
 	  if(tailoringOrFabric.equals("0")){ //查成衣
-			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.status",1).groupBy("b.group_id");
+			  queryWrapper.eq("a.del_flag",0).eq("b.del_flag",0).eq("a.the_documents_state",1).groupBy("b.group_id");
 			  queryWrapper.groupBy("a.document_No");
 		  pageList = syShippingOrderService.queryTailoring(page,queryWrapper);
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/syShippingOrder/entity/VO/SyPackingList.java

@@ -84,6 +84,10 @@ public class SyPackingList {
     private BigDecimal totalNetWeight;
     @ApiModelProperty(value = "体积")
     private BigDecimal totalVolume;
+    @ApiModelProperty(value = "订单号")
+    private String orderNumber;
+    @ApiModelProperty(value = "业务员")
+    private String salesman;
 
 
 }

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

@@ -22,10 +22,10 @@
     select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,a.depositary_receipt_no as depositaryReceiptNo,
      a.item_number as itemNumber,b.inventory_name as inventoryName,b.distribution_point as distributionPoint,a.customer_abbreviation as customerAbbreviation,
      b.item_code as itemCode,b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.hod as preDeliveryDate,b.small_Po as smallPo,
-     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,
+     b.colour as colour,b.pieces_box as piecesBox,b.box_number as boxNumber,b.total as total,b.outer_box_length as outerBoxLength,a.customer as customer,b.order_Number as orderNumber,
      b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,sum(b.total_volume) as totalVolume,sum(b.total_net_weight) as totalNetWeight,b.spur_Or_Sub_Order as purOrSubOrder,
      sum(b.total_gross_weight) as totalGrossWeight,'成衣' as readyFabric,a.memo as memo,b.salesman as salesman,b.factory_Unit_Price as factoryUnitPrice,sum(b.total_price) as totalPrice,
-     sum(b.plan_Quantity) as planQuantity,sum(b.actual_Packing_Qty) as actualPackingQty,a.container_code as containerCode,b.container_number as containerNumber
+     sum(b.plan_Quantity) as planQuantity,sum(b.actual_Packing_Qty) as actualPackingQty,a.container_code as containerCode,a.container_number as containerNumber
        from sy_packing_list_tailoring a
     left join sy_packing_list_tailoring_item b
     on a.id = b.sy_packing_list_tailoring_id
@@ -36,7 +36,7 @@
     <!--    查询装箱单-面料-->
     <select id="queryFabric" resultType="org.jeecg.modules.documents.syShippingOrder.entity.VO.SyPackingList">
 
-    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,a.order_number as orderNumber,
+    select a.id as id ,GROUP_CONCAT(b.id) as itemId, a.document_No as documentNo,b.order_number as orderNumber,
     b.item_Number as itemNumber,a.customer_Abbreviation as customerAbbreviation,a.customer,b.small_Po as smallPo,b.distribution_Point as distributionPoint,
     b.salesman as salesman,b.pur_Or_Sub_Order as purOrSubOrder,b.factory_Unit_Price as factoryUnitPrice,'0' as totalVolume,'0' as actualPackingQty,
     a.depositary_receipt_no as depositaryReceiptNo,b.order_Type as orderType,sum(b.gross_weight) as totalGrossWeight,sum(b.total_Price) as totalPrice,