Merge remote-tracking branch 'origin/master'

op-modules/op-wms/src/main/java/com/op/wms/controller/OdsProcureOutOrderController.java

@@ -39,11 +39,23 @@ public class OdsProcureOutOrderController extends BaseController {
 	@RequiresPermissions("wms:outorder:list")
 	@GetMapping("/list")
 	public TableDataInfo list(OdsProcureOutOrder odsProcureOutOrder) {
-		startPage();
+//		startPage();
 		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderList(odsProcureOutOrder);
 		return getDataTable(list);
 	}
 
+	@PostMapping("/listZU")
+	public TableDataInfo listZU(OdsProcureOutOrder odsProcureOutOrder) {
+		startPage();
+		List<OdsProcureOutOrder> list = odsProcureOutOrderService.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+		for (OdsProcureOutOrder	odsProcureOutOrder1:
+				list) {
+			List<OdsProcureOutOrder>	orderList1=	odsProcureOutOrderService.selectOdsProcureOutOrderListZUTwo(odsProcureOutOrder1);
+			odsProcureOutOrder1.setList(orderList1);
+		}
+
+		return getDataTable(list);
+	}
 	/**
 	 * 导出包材出库单列表
 	 */

op-modules/op-wms/src/main/java/com/op/wms/mapper/OdsProcureOutOrderMapper.java

@@ -69,4 +69,8 @@ public interface OdsProcureOutOrderMapper {
 	void updateOdsProcureOutOrderByid(OdsProcureOutOrder odsProcureOutOrder);
 
 	List<OdsProcureOutOrder> selectOdsProcureOutOrderListByIds(@Param("list") List<OdsProcureOutOrder> orderList);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUT(OdsProcureOutOrder odsProcureOutOrder1);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/IOdsProcureOutOrderService.java

@@ -57,4 +57,8 @@ public interface IOdsProcureOutOrderService {
 	 * @return 结果
 	 */
 	public int deleteOdsProcureOutOrderByID(String ID);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder);
+
+	List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1);
 }

op-modules/op-wms/src/main/java/com/op/wms/service/impl/OdsProcureOutOrderServiceImpl.java

@@ -1,5 +1,6 @@
 package com.op.wms.service.impl;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import com.baomidou.dynamic.datasource.annotation.DS;
@@ -91,4 +92,16 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
 	public int deleteOdsProcureOutOrderByID(String ID) {
 		return odsProcureOutOrderMapper.deleteOdsProcureOutOrderByID(ID);
 	}
+
+	@Override
+	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) {
+
+		return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+	}
+
+	@Override
+	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZUTwo(OdsProcureOutOrder odsProcureOutOrder1) {
+		List<OdsProcureOutOrder>	orderList= odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUT(odsProcureOutOrder1);
+		return orderList;
+	}
 }

op-modules/op-wms/src/main/resources/mapper/wms/OdsProcureOutOrderMapper.xml

@@ -40,11 +40,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="enterpriseId"	column="Enterprise_Id"	/>
 		<result property="enterpriseCode"	column="Enterprise_Code"	/>
 	</resultMap>
-
+	<sql id="pagination_tail">
+		limit #{page.pageOffset} , #{page.rows}
+	</sql>
 	<sql id="selectOdsProcureOutOrderVo">
 		select Site_code, ID, Produce_Code, Material_Code, Material_Desc, Plan_Date, Plan_Number, Unit,  COALESCE(Out_Number, 0) as Out_Number , Loc_Code, Loc_Desc, Production_Line_Desc, Production_Line_Code, Order_Status, User_Defined1, User_Defined2, User_Defined3, User_Defined4, User_Defined5, User_Defined6, User_Defined7, User_Defined8, User_Defined9, User_Defined10, User_Defined11, Supplier_Code, Supplier_Name, Create_By, Create_Date, Last_Update_By, Last_Update_Date, Active, Enterprise_Id, Enterprise_Code from ods_procure_out_order
 	</sql>
-
+	<select id="selectOdsProcureOutOrderListZU" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		SELECT
+		Produce_Code,
+		User_Defined1
+		FROM
+		ods_procure_out_order
+		where
+		Active='1'
+		<if test="produceCode != null  and produceCode != ''"> and Produce_Code = #{produceCode}</if>
+		<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
+		GROUP BY	Produce_Code,User_Defined1
+	</select>
+	<select id="selectOdsProcureOutOrderListZUT" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
+		<include refid="selectOdsProcureOutOrderVo"/>
+		<where>
+			<if test="produceCode != null  and produceCode != ''"> and Produce_Code = #{produceCode}</if>
+			<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
+			<if test="Active != null  and Active != ''"> and Active = #{Active}</if>
+		</where>
+	</select>
 	<select id="selectOdsProcureOutOrderList" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		<include refid="selectOdsProcureOutOrderVo"/>
 		<where>
@@ -294,4 +315,5 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			#{item.ID}
 		</foreach>
 	</select>
+
 </mapper>