wms出库过账修改20

op-modules/op-wms/src/main/java/com/op/wms/domain/OdsProcureOutOrder.java

@@ -167,8 +167,8 @@ public class OdsProcureOutOrder extends BaseEntity {
 	private String supplierName;
 
 	/** 创建时间 */
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
 	private Date createDate;
 
 	/** 最后更新人 */
@@ -191,6 +191,24 @@ public class OdsProcureOutOrder extends BaseEntity {
 	/** 企业编码 */
 	@Excel(name = "企业编码")
 	private String enterpriseCode;
+	private String sapMag;
+	private String sapXMag;
+
+	public String getSapMag() {
+		return sapMag;
+	}
+
+	public void setSapMag(String sapMag) {
+		this.sapMag = sapMag;
+	}
+
+	public String getSapXMag() {
+		return sapXMag;
+	}
+
+	public void setSapXMag(String sapXMag) {
+		this.sapXMag = sapXMag;
+	}
 
 	public void setSiteCode(String siteCode) {
 		this.siteCode = siteCode;

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

@@ -78,4 +78,8 @@ public interface OdsProcureOutOrderMapper {
 	List<OdsProcureOutOrder> selectOdsProcureOutOrderListByu1(@Param("list")List<OdsProcureOutOrder> orderList);
 
 	void updateOdsProcureOutOrderByids(@Param("order")OdsProcureOutOrder order,@Param("list") List<OdsProcureOutOrder>	sapMaterialPostingList);
+
+	List<String> selectOdsProcureOutOrderListZUKEN(OdsProcureOutOrder order);
+
+	List<String> selectOdsProcureOutOrderListZUKENX(OdsProcureOutOrder order);
 }

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

@@ -96,8 +96,26 @@ public class OdsProcureOutOrderServiceImpl implements IOdsProcureOutOrderService
 	@Override
 	@DS("#header.poolName")
 	public List<OdsProcureOutOrder> selectOdsProcureOutOrderListZU(OdsProcureOutOrder odsProcureOutOrder) {
+		List<OdsProcureOutOrder>	orderList=odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+		for (OdsProcureOutOrder	order:
+		orderList) {
+			String	sapMag="";
+			String	sapxMag="";
+			List<String>	sapMags=		odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUKEN(order);
+			for (String	mag:
+			sapMags) {
+				sapMag=sapMag+mag;
+			}
+			List<String>	sapxMags=		odsProcureOutOrderMapper.selectOdsProcureOutOrderListZUKENX(order);
+			for (String	magx:
+					sapxMags) {
+				sapxMag=sapxMag+magx;
+			}
+			order.setSapMag(sapMag);
+			order.setSapXMag(sapxMag);
+		}
 
-		return odsProcureOutOrderMapper.selectOdsProcureOutOrderListZU(odsProcureOutOrder);
+		return orderList;
 	}
 
 	@Override

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

@@ -58,6 +58,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="userDefined1 != null  and userDefined1 != ''"> and User_Defined1 = #{userDefined1}</if>
 		GROUP BY	Produce_Code,User_Defined1
 	</select>
+	<select id="selectOdsProcureOutOrderListZUKEN"	resultType="java.lang.String">
+		SELECT	DISTINCT
+		User_Defined11
+		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>
+		AND	User_Defined3	!='x'
+	</select>
+	<select id="selectOdsProcureOutOrderListZUKENX"	resultType="java.lang.String">
+		SELECT	DISTINCT
+		User_Defined11
+		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>
+		AND	User_Defined3	='x'
+	</select>
 	<select id="selectOdsProcureOutOrderListZUT" parameterType="OdsProcureOutOrder" resultMap="OdsProcureOutOrderResult">
 		<include refid="selectOdsProcureOutOrderVo"/>
 		<where>