销售订单单证 表体显示分组

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/controller/SyOrderDataItemController.java

@@ -61,7 +61,7 @@ public class SyOrderDataItemController extends JeecgController<SyOrderDataItem,
 	 */
 	@AutoLog(value = "订单子表信息-分页列表单表查询")
 	@ApiOperation(value="订单子表信息-分页列表单表查询", notes="订单子表信息-分页列表单表查询")
-	@GetMapping(value = "/lists")
+	@GetMapping(value = "/list")
 	public Result<?> queryPageLists(SyOrderDataItem syOrderDataItem,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -75,7 +75,7 @@ public class SyOrderDataItemController extends JeecgController<SyOrderDataItem,
 	 /**
 	  * 分页列表查询 联查
 	  *
-	  * @param orderNumber
+	  * @param syOrderDataId
 	  * @param pageNo
 	  * @param pageSize
 	  * @param req
@@ -83,13 +83,13 @@ public class SyOrderDataItemController extends JeecgController<SyOrderDataItem,
 	  */
 	 @AutoLog(value = "订单子表信息-分页列表查询")
 	 @ApiOperation(value="订单子表信息-分页列表查询", notes="订单子表信息-分页列表查询")
-	 @GetMapping(value = "/list")
-	 public Result<?> queryPageList(String orderNumber,
+	 @GetMapping(value = "/lists")
+	 public Result<?> queryPageList(String syOrderDataId,
 									@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 									@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 									HttpServletRequest req) {
 		 Page<SyOrderDataItem> page = new Page<SyOrderDataItem>(pageNo, pageSize);
-		 IPage<SyOrderDataItem> pageList = syOrderDataItemService.queryList(orderNumber, page);
+		 IPage<SyOrderDataItem> pageList = syOrderDataItemService.queryList(syOrderDataId, page);
 		 return Result.OK(pageList);
 	 }
 

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/SyOrderDataItemMapper.java

@@ -14,5 +14,5 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @Version: V1.0
  */
 public interface SyOrderDataItemMapper extends BaseMapper<SyOrderDataItem> {
-     IPage<SyOrderDataItem> queryList(@Param("orderNumber") String orderNumber, Page<SyOrderDataItem> page);
+     IPage<SyOrderDataItem> queryList(@Param("syOrderDataId") String syOrderDataId, Page<SyOrderDataItem> page);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/mapper/xml/SyOrderDataItemMapper.xml

@@ -2,7 +2,22 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.jeecg.modules.documents.orderData.mapper.SyOrderDataItemMapper">
     <select id="queryList" resultType="org.jeecg.modules.documents.orderData.entity.SyOrderDataItem" >
-        select * from sy_order_data_item where sy_order_data_id =
-        (SELECT id FROM sy_order_data where order_number = #{orderNumber})
+        SELECT
+            sy_order_data_id,item_number,pre_delivery_date,pre_completion_date,pack_id,small_po,distribution_point,
+            inventory_code,inventory_name,specification_and_model,colour,coding_rules,guangpei_gate_width,box_number,
+            sum(quantity),master_metering,unit_price_including_tax,total_price_and_tax,tax_rate,remarks,bank_closed_by
+        FROM
+            sy_order_data_item
+        WHERE
+            sy_order_data_id = #{syOrderDataId}
+        GROUP BY
+            pack_id,
+            small_po,
+            pre_delivery_date,
+            pre_completion_date,
+            item_number,
+            inventory_code,
+            colour,
+            coding_rules
     </select>
 </mapper>

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/ISyOrderDataItemService.java

@@ -12,5 +12,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * @Version: V1.0
  */
 public interface ISyOrderDataItemService extends IService<SyOrderDataItem> {
-    IPage<SyOrderDataItem> queryList(String orderNumber, Page<SyOrderDataItem> page);
+    IPage<SyOrderDataItem> queryList(String syOrderDataId, Page<SyOrderDataItem> page);
 }

jeecg-boot-module-system/src/main/java/org/jeecg/modules/documents/orderData/service/impl/SyOrderDataItemServiceImpl.java

@@ -25,7 +25,7 @@ public class SyOrderDataItemServiceImpl extends ServiceImpl<SyOrderDataItemMappe
     private SyOrderDataItemMapper syOrderDataItemMapper;
 
     @Override
-    public IPage<SyOrderDataItem> queryList(String orderNumber, Page<SyOrderDataItem> page) {
-        return syOrderDataItemMapper.queryList(orderNumber,page);
+    public IPage<SyOrderDataItem> queryList(String syOrderDataId, Page<SyOrderDataItem> page) {
+        return syOrderDataItemMapper.queryList(syOrderDataId,page);
     }
 }