UDI
/
udi-wms-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采购订单按供应商创建

Browse Source
pro
anthonywj 2 years ago
parent b517963a08
commit d166dd09d7
3 changed files with 99 additions and 90 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/entity/purchase/PurOrderEntity.java
Unescape Escape View File

@ -132,6 +132,9 @@ public class PurOrderEntity {
@TableField(value = "emergency") @TableField(value = "emergency")
private Integer emergency; private Integer emergency;
@TableField(value = "supId")
private String supId;
/** /**
* 是否已生成采购计划 * 是否已生成采购计划
*/ */

2
src/main/java/com/glxp/api/res/purchase/PurOrderResponse.java
Unescape Escape View File

@ -73,4 +73,6 @@ public class PurOrderResponse {
private String auditUserName; private String auditUserName;
private Integer emergency; private Integer emergency;
private Date arrivalTime; private Date arrivalTime;
private String supId;
private String supName;
} }

88
src/main/resources/mybatis/mapper/purchase/PurOrderDao.xml
Unescape Escape View File

@ -4,26 +4,26 @@
<resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity"> <resultMap id="BaseResultMap" type="com.glxp.api.entity.purchase.PurOrderEntity">
<!--@mbg.generated--> <!--@mbg.generated-->
<!--@Table pur_order--> <!--@Table pur_order-->
<id column="id" jdbcType="BIGINT" property="id" /> <id column="id" jdbcType="BIGINT" property="id"/>
<result column="billNo" jdbcType="VARCHAR" property="billNo" /> <result column="billNo" jdbcType="VARCHAR" property="billNo"/>
<result column="billDate" jdbcType="TIMESTAMP" property="billDate" /> <result column="billDate" jdbcType="TIMESTAMP" property="billDate"/>
<result column="status" jdbcType="TINYINT" property="status" /> <result column="status" jdbcType="TINYINT" property="status"/>
<result column="billType" jdbcType="VARCHAR" property="billType" /> <result column="billType" jdbcType="VARCHAR" property="billType"/>
<result column="remark" jdbcType="VARCHAR" property="remark" /> <result column="remark" jdbcType="VARCHAR" property="remark"/>
<result column="invCode" jdbcType="VARCHAR" property="invCode" /> <result column="invCode" jdbcType="VARCHAR" property="invCode"/>
<result column="deptCode" jdbcType="VARCHAR" property="deptCode" /> <result column="deptCode" jdbcType="VARCHAR" property="deptCode"/>
<result column="createUser" jdbcType="VARCHAR" property="createUser" /> <result column="createUser" jdbcType="VARCHAR" property="createUser"/>
<result column="createTime" jdbcType="TIMESTAMP" property="createTime" /> <result column="createTime" jdbcType="TIMESTAMP" property="createTime"/>
<result column="auditUser" jdbcType="VARCHAR" property="auditUser" /> <result column="auditUser" jdbcType="VARCHAR" property="auditUser"/>
<result column="auditTime" jdbcType="TIMESTAMP" property="auditTime" /> <result column="auditTime" jdbcType="TIMESTAMP" property="auditTime"/>
<result column="auditRemark" jdbcType="VARCHAR" property="auditRemark" /> <result column="auditRemark" jdbcType="VARCHAR" property="auditRemark"/>
<result column="updateTime" jdbcType="TIMESTAMP" property="updateTime" /> <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
<result column="updateUser" jdbcType="VARCHAR" property="updateUser" /> <result column="updateUser" jdbcType="VARCHAR" property="updateUser"/>
<result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser" /> <result column="applyCreateUser" jdbcType="VARCHAR" property="applyCreateUser"/>
<result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser" /> <result column="applyAuditUser" jdbcType="VARCHAR" property="applyAuditUser"/>
<result column="applyRemark" jdbcType="VARCHAR" property="applyRemark" /> <result column="applyRemark" jdbcType="VARCHAR" property="applyRemark"/>
<result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo" /> <result column="applyBillNo" jdbcType="VARCHAR" property="applyBillNo"/>
<result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo" /> <result column="stockOrderNo" jdbcType="VARCHAR" property="stockOrderNo"/>
</resultMap> </resultMap>
<sql id="Base_Column_List"> <sql id="Base_Column_List">
<!--@mbg.generated--> <!--@mbg.generated-->
@ -35,43 +35,50 @@
<select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest" <select id="queryPageList" parameterType="com.glxp.api.req.purchase.PurOrderRequest"
resultType="com.glxp.api.res.purchase.PurOrderResponse"> resultType="com.glxp.api.res.purchase.PurOrderResponse">
SELECT pur_order.*,
SELECT
pur_order.*,
cb.employeeName createUserName, cb.employeeName createUserName,
ab.employeeName auditUserName, ab.employeeName auditUserName,
auth_warehouse.NAME invName, auth_warehouse.NAME invName,
auth_dept.`name` deptName auth_dept.`name` deptName,
FROM basic_corp.name supName
pur_order FROM pur_order
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
left join basic_corp on pur_order.supId = basic_corp.erpId
<where> <where>
<if test="billNo != '' and billNo != null"> <if test="billNo != '' and billNo != null">
AND billNo = #{billNo} AND billNo = #{billNo}
</if> </if>
<if test="startDate != null and startDate !=''"> <if test="startDate != null and startDate != ''">
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]> <![CDATA[
and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
]]>
</if> </if>
<if test="endDate != null and endDate !=''"> <if test="endDate != null and endDate != ''">
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]> <![CDATA[
and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
]]>
</if> </if>
<if test="startAuditDate != null and startAuditDate !=''"> <if test="startAuditDate != null and startAuditDate != ''">
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]> <![CDATA[
and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
]]>
</if> </if>
<if test="endAuditDate != null and endAuditDate !=''"> <if test="endAuditDate != null and endAuditDate != ''">
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]> <![CDATA[
and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
]]>
</if> </if>
<if test="status!=null and status!=10 and status!=11"> <if test="status != null and status != 10 and status != 11">
and pur_order.status = #{status} and pur_order.status = #{status}
</if> </if>
<if test="status ==10"> <if test="status == 10">
and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4) and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
</if> </if>
<if test="status ==11"> <if test="status == 11">
and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4) and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
</if> </if>
<if test="deptCode != '' and deptCode != null"> <if test="deptCode != '' and deptCode != null">
@ -90,8 +97,5 @@
AND emergency = #{emergency} AND emergency = #{emergency}
</if> </if>
</where> </where>
</select> </select>
</mapper> </mapper>

Write Preview
Loading…
Cancel
Save