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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
pro
郑明梁 2 years ago
parent a1b4542df6 aaff1b1d7f
commit d24a412535
10 changed files with 162 additions and 113 deletions
Show Stats Download Patch File Download Diff File

21
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -591,11 +591,30 @@ public class IoOrderDetailBizController extends BaseController {
@PostMapping("/udiwms/inout/biz/updateById") @PostMapping("/udiwms/inout/biz/updateById")
@Log(title = "发票管理", businessType = BusinessType.UPDATE) @Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) { public BaseResponse deleteById(@RequestBody IoOrderInvoiceRequest ioOrderInvoiceRequest) {
IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderInvoiceRequest.getOrderIdFk());
if (orderEntity != null) {
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
}
return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest)); return ResultVOUtils.success(ioOrderInvoiceService.updateByInvId(ioOrderInvoiceRequest));
} }
@PostMapping("/udiwms/inout/bizDetail/updateById")
@Log(title = "发票管理", businessType = BusinessType.UPDATE)
public BaseResponse updateBizById(@RequestBody IoOrderDetailBizEntity ioOrderDetailBizEntity) {
IoOrderEntity orderEntity = orderService.findByBillNo(ioOrderDetailBizEntity.getOrderIdFk());
if (orderEntity != null) {
orderEntity.setUpdateTime(new Date());
orderService.update(orderEntity);
}
ioOrderDetailBizEntity.setCheckFileName(ioOrderDetailBizEntity.getFilePath());
ioOrderDetailBizEntity.setCheckColdFileName(ioOrderDetailBizEntity.getColdFilePath());
boolean b = orderDetailBizService.updateOrderDetailBiz(ioOrderDetailBizEntity);
return ResultVOUtils.success("修改成功！");
}
@PostMapping("/udiwms/inout/biz/insertInvoice") @PostMapping("/udiwms/inout/biz/insertInvoice")
@Log(title = "发票管理", businessType = BusinessType.INSERT) @Log(title = "发票管理", businessType = BusinessType.INSERT)

2
src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java
Unescape Escape View File

@ -39,7 +39,7 @@ public class IoOrderInvoiceController {
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/udiwms/inout/order/refrshInvoice") @PostMapping("/udiwms/inout/order/refrshInvoice")
@Log(title = "发票", businessType = BusinessType.INSERT) @Log(title = "发票", businessType = BusinessType.INSERT)
public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) { public BaseResponse refrshInvoice(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
BaseResponse<RefreshInoiceResponse> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest); BaseResponse<RefreshInoiceResponse> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
if (baseResponse.getCode() == 20000) { if (baseResponse.getCode() == 20000) {
RefreshInoiceResponse refreshInoiceResponse = baseResponse.getData(); RefreshInoiceResponse refreshInoiceResponse = baseResponse.getData();

9
src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java
Unescape Escape View File

@ -179,12 +179,21 @@ public class IoOrderDetailBizEntity {
@TableField(value = "filePath") @TableField(value = "filePath")
private String filePath; private String filePath;
@TableField(value = "coldFilePath")
private String coldFilePath;
/** /**
* 检验报告名称 * 检验报告名称
*/ */
@TableField(value = "checkFileName") @TableField(value = "checkFileName")
private String checkFileName; private String checkFileName;
/**
* 冷链报告名称
*/
@TableField(value = "checkColdFileName")
private String checkColdFileName;
@TableField(exist = false) @TableField(exist = false)
private boolean checkSuccess; private boolean checkSuccess;

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;
/** /**
* 是否已生成采购计划 * 是否已生成采购计划
*/ */

5
src/main/java/com/glxp/api/res/inout/IoOrderDetailBizResponse.java
Unescape Escape View File

@ -167,6 +167,11 @@ public class IoOrderDetailBizResponse {
private boolean regStatus; private boolean regStatus;
private String coldFilePath;
private String checkColdFileName;

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;
} }

9
src/main/resources/mybatis/mapper/inout/InvUserProductDao.xml
Unescape Escape View File

@ -13,11 +13,11 @@
<select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest" <select id="selectOrderInvoice" parameterType="com.glxp.api.req.inout.IoOrderInvoiceRequest"
resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity"> resultType="com.glxp.api.entity.inout.IoOrderInvoiceEntity">
SELECT ic.*, SELECT ic.*,
(select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc, bp.cpmctymc,
(select ggxh from basic_products where basic_products.uuid = bu.uuid) ggxh bp.ggxh
FROM io_order_invoice ic FROM io_order_invoice ic
LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND ic.orderIdFk = #{orderIdFk} AND ic.orderIdFk = #{orderIdFk}
@ -34,7 +34,6 @@
<if test="batchNo == null || batchNo == ''"> <if test="batchNo == null || batchNo == ''">
AND (ic.batchNo is null or ic.batchNo = '') AND (ic.batchNo is null or ic.batchNo = '')
</if> </if>
</where> </where>
GROUP BY ic.id GROUP BY ic.id
</select> </select>

34
src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml
Unescape Escape View File

@ -4,8 +4,8 @@
<select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse"> <select id="filterList" resultType="com.glxp.api.res.inout.IoOrderDetailBizResponse">
select io_order_detail_biz.* select io_order_detail_biz.*
from io_order_detail_biz from io_order_detail_biz
left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk left join basic_udirel bu on bu.id = io_order_detail_biz.bindRlFk
left join basic_products bp on bu.uuid = bp.uuid left join basic_products bp on bu.uuid = bp.uuid
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}
@ -23,20 +23,22 @@
group by io_order_detail_biz.id group by io_order_detail_biz.id
</select> </select>
<select id="selectByinvoiceId" parameterType="java.lang.Long" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse"> <select id="selectByinvoiceId" parameterType="java.lang.Long"
select * from io_order_invoice where id= #{id} resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
select *
from io_order_invoice
where id = #{id}
</select> </select>
<select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse"> <select id="getfilterList" resultType="com.glxp.api.res.inout.IoOrderDetailCodeResponse">
select io_order_detail_code.*, select io_order_detail_code.*,
(select count(*) (select count(*)
FROM io_order_invoice FROM io_order_invoice
where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount where io_order_invoice.orderIdFk = io_order_detail_code.orderIdFk) as sucCount
from io_order_detail_code from io_order_detail_code
left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk left join basic_udirel bu on bu.id = io_order_detail_code.bindRlFk
left join basic_products bp on bu.uuid = bp.uuid left join basic_products bp on bu.uuid = bp.uuid
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND orderIdFk = #{orderIdFk} AND orderIdFk = #{orderIdFk}
@ -56,11 +58,11 @@
<select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse"> <select id="filterListInv" resultType="com.glxp.api.res.inout.IoOrderInvoiceResponse">
SELECT ic.*, SELECT ic.*,
(select cpmctymc from basic_products where basic_products.uuid = bu.uuid) cpmctymc, bp.cpmctymc,
(select ggxh from basic_products where basic_products.uuid = bu.uuid) ggxh bp.ggxh
FROM io_order_invoice ic FROM io_order_invoice ic
LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk LEFT JOIN basic_udirel bu ON bu.id = ic.bindRlFk
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
<where> <where>
<if test="orderIdFk != null and orderIdFk != ''"> <if test="orderIdFk != null and orderIdFk != ''">
AND ic.orderIdFk = #{orderIdFk} AND ic.orderIdFk = #{orderIdFk}
@ -77,13 +79,13 @@
<if test="batchNo == null || batchNo == ''"> <if test="batchNo == null || batchNo == ''">
AND (ic.batchNo is null or ic.batchNo = '') AND (ic.batchNo is null or ic.batchNo = '')
</if> </if>
</where> </where>
GROUP BY ic.id GROUP BY ic.id
</select> </select>
<select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity"> <select id="selectOrderDetailBiz" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
select * from io_order_detail_biz select *
from io_order_detail_biz
<where> <where>
<if test="orderId != null and orderId != ''"> <if test="orderId != null and orderId != ''">
AND orderIdFk = #{orderId} AND orderIdFk = #{orderId}

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

@ -1,97 +1,101 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.glxp.api.dao.purchase.PurOrderDao"> <mapper namespace="com.glxp.api.dao.purchase.PurOrderDao">
<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-->
id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`, id, billNo, billDate, `status`, billType, remark, invCode, deptCode, `createUser`,
createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser, createTime, auditUser, auditTime, auditRemark, updateTime, updateUser, applyCreateUser,
applyAuditUser, applyRemark, applyBillNo, stockOrderNo applyAuditUser, applyRemark, applyBillNo, stockOrderNo
</sql> </sql>
<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 cb.employeeName createUserName,
pur_order.*, ab.employeeName auditUserName,
cb.employeeName createUserName, auth_warehouse.NAME invName,
ab.employeeName auditUserName, auth_dept.`name` deptName,
auth_warehouse.NAME invName, basic_corp.name supName
auth_dept.`name` deptName FROM pur_order
FROM LEFT JOIN auth_user cb ON pur_order.createUser = cb.id
pur_order LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id
LEFT JOIN auth_user cb ON pur_order.createUser = cb.id LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code`
LEFT JOIN auth_user ab ON pur_order.auditUser = ab.id LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode
LEFT JOIN auth_warehouse ON pur_order.invCode = auth_warehouse.`code` left join basic_corp on pur_order.supId = basic_corp.erpId
LEFT JOIN auth_dept ON auth_dept.CODE = pur_order.deptCode <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[
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d')>= #{startDate}]]> and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') >= #{startDate}
</if> ]]>
<if test="endDate != null and endDate !=''"> </if>
<![CDATA[ and DATE_FORMAT(pur_order.createTime,'%Y-%m-%d') <= #{endDate}]]> <if test="endDate != null and endDate != ''">
</if> <![CDATA[
<if test="startAuditDate != null and startAuditDate !=''"> and DATE_FORMAT(pur_order.createTime, '%Y-%m-%d') <= #{endDate}
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d')>= #{startAuditDate}]]> ]]>
</if> </if>
<if test="endAuditDate != null and endAuditDate !=''"> <if test="startAuditDate != null and startAuditDate != ''">
<![CDATA[ and DATE_FORMAT(pur_order.auditTime,'%Y-%m-%d') <= #{endAuditDate}]]> <![CDATA[
</if> and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') >= #{startAuditDate}
<if test="status!=null and status!=10 and status!=11"> ]]>
and pur_order.status = #{status} </if>
</if> <if test="endAuditDate != null and endAuditDate != ''">
<if test="status ==10"> <![CDATA[
and ( pur_order.status = 3 or pur_order.status=2 or pur_order.status=4) and DATE_FORMAT(pur_order.auditTime, '%Y-%m-%d') <= #{endAuditDate}
</if> ]]>
<if test="status ==11"> </if>
and ( pur_order.status = 1 or pur_order.status=2 or pur_order.status=4) <if test="status != null and status != 10 and status != 11">
</if> and pur_order.status = #{status}
</if>
<if test="deptCode != '' and deptCode != null"> <if test="status == 10">
AND deptCode = #{deptCode} and (pur_order.status = 3 or pur_order.status = 2 or pur_order.status = 4)
</if> </if>
<if test="invCode != '' and invCode != null"> <if test="status == 11">
AND invCode = #{invCode} and (pur_order.status = 1 or pur_order.status = 2 or pur_order.status = 4)
</if> </if>
<if test="auditUser != '' and auditUser != null">
AND auditUser = #{auditUser}
</if>
<if test="createUser != '' and createUser != null">
AND createUser = #{createUser}
</if>
<if test="emergency != null">
AND emergency = #{emergency}
</if>
</where>
</select>
<if test="deptCode != '' and deptCode != null">
AND deptCode = #{deptCode}
</if>
<if test="invCode != '' and invCode != null">
AND invCode = #{invCode}
</if>
<if test="auditUser != '' and auditUser != null">
AND auditUser = #{auditUser}
</if>
<if test="createUser != '' and createUser != null">
AND createUser = #{createUser}
</if>
<if test="emergency != null">
AND emergency = #{emergency}
</if>
</where>
</select>
</mapper> </mapper>

6
src/main/resources/schemas/schema_v2.1.sql
Unescape Escape View File

@ -37,6 +37,12 @@ CALL Pro_Temp_ColumnWork('thr_system_bus_api', 'thirdBuyName', 'varchar(255) ',
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'bindRlIds', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkFileName', 'varchar(255) ', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'coldFilePath', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'checkColdFileName', 'varchar(255)', 1);
CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1); CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'int ', 1);
CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1); CALL Pro_Temp_ColumnWork('thr_products', 'updateUser', 'varchar(255) ', 1);

Write Preview
Loading…
Cancel
Save