适配平板修改

dev_no_inv
yewj 9 months ago
parent 673532e300
commit 84639dac58

@ -40,8 +40,8 @@ public class IoCollectOrderBackupController extends BaseController {
private BasicCollectUserService basicCollectUserService; private BasicCollectUserService basicCollectUserService;
@GetMapping("/udiwms/basic/collect/orderFinish/filter") @PostMapping("/udiwms/basic/collect/orderFinish/filter")
public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) { public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
List<Long> workPlaceCodes = null; List<Long> workPlaceCodes = null;
List<UserWorkResponse> page; List<UserWorkResponse> page;

@ -15,14 +15,9 @@ import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.collect.CollectOrderCodeManResponse; import com.glxp.api.res.collect.CollectOrderCodeManResponse;
import com.glxp.api.res.inout.VailCodeResultResponse; import com.glxp.api.res.inout.VailCodeResultResponse;
import com.glxp.api.res.inout.VailTagResultResponse; import com.glxp.api.res.inout.VailTagResultResponse;
import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.basic.UdiRelevanceService;
import com.glxp.api.service.collect.IoCollectOrderBizService;
import com.glxp.api.service.collect.IoCollectOrderCodeManService; import com.glxp.api.service.collect.IoCollectOrderCodeManService;
import com.glxp.api.service.collect.IoCollectOrderService; import com.glxp.api.service.collect.IoCollectOrderService;
import com.glxp.api.util.GennerOrderUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.json.JSONException;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;

@ -13,7 +13,7 @@ import java.util.List;
public class CollectOrderRequest extends ListPageRequest { public class CollectOrderRequest extends ListPageRequest {
private Integer id; private Long id;
/** /**
* *
@ -150,5 +150,4 @@ public class CollectOrderRequest extends ListPageRequest {
private String shipperName; private String shipperName;
} }

@ -4,9 +4,9 @@ server:
spring: spring:
datasource: datasource:
driver-class-name: com.p6spy.engine.spy.P6SpyDriver driver-class-name: com.p6spy.engine.spy.P6SpyDriver
jdbc-url: jdbc:p6spy:mysql://dm.xmglxp.com:33066/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true jdbc-url: jdbc:p6spy:mysql://127.0.0.1:3306/udi_wms_ywj?allowMultiQueries=true&serverTimezone=Asia/Shanghai&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true
username: root username: root
password: Glxp@6066 password: 123456
hikari: hikari:
connection-timeout: 60000 connection-timeout: 60000
maximum-pool-size: 20 maximum-pool-size: 20

@ -1,43 +1,44 @@
<?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.collect.IoCollectOrderBackupMapper"> <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBackupMapper">
<select id="filterList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse"> <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
SELECT icob.billNo, SELECT icob.billNo,
icob.busType, icob.busType,
icob.fromType, icob.fromType,
icob.fromTypeDesc, icob.fromTypeDesc,
icob.fromCorp, icob.fromCorp,
icob.billTime, icob.billTime,
icob.orderCirType, icob.orderCirType,
icob.createTime, icob.createTime,
icob.workPlaceCode, icob.workPlaceCode,
icob.remark, icob.remark,
icob.createUser, icob.createUser,
icob.updateTime, icob.updateTime,
icob.updateUser, icob.updateUser,
icob.tagStatus, icob.tagStatus,
icob.splitStatus, icob.splitStatus,
icob.invAlert, icob.invAlert,
icob.splitMsg, icob.splitMsg,
icob.fromCorpName, icob.fromCorpName,
icob.shipperName, icob.shipperName,
icob.thrBusType, icob.thrBusType,
icob.shipper, icob.shipper,
icob.tagMsg, icob.tagMsg,
sys_workplace_document.busName busTypeName, sys_workplace_document.busName busTypeName,
sw.workplaceName, sw.workplaceName,
icob.id, icob.id,
icob.orderTime, icob.orderTime,
icob.uploadStatus, icob.uploadStatus,
icob.uploadError, icob.uploadError,
icob.errorMsg, icob.errorMsg,
row_number() over ( order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc ) row_number() over ( order by case
as orderSequence when icob.orderTime is null then icob.createTime
else icob.orderTime end desc )
as orderSequence
FROM io_collect_order_backup icob FROM io_collect_order_backup icob
left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode left join sys_workplace_document on icob.busType = sys_workplace_document.documentTypeCode
left join basic_corp bc on icob.fromCorp = bc.erpId left join basic_corp bc on icob.fromCorp = bc.erpId
left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId left join sys_workplace sw on icob.workPlaceCode = sw.workplaceId
<where> <where>
<if test="billNo != '' and billNo != null"> <if test="billNo != '' and billNo != null">
AND billNo LIKE concat('%', #{billNo}, '%') AND billNo LIKE concat('%', #{billNo}, '%')
@ -51,9 +52,6 @@
<if test="fromCorp != '' and fromCorp != null"> <if test="fromCorp != '' and fromCorp != null">
AND fromCorp LIKE concat('%', #{fromCorp}, '%') AND fromCorp LIKE concat('%', #{fromCorp}, '%')
</if> </if>
<if test="collectCode != null and collectCode != ''">
AND collectCode = #{collectCode}
</if>
<if test="busType != null and busType != ''"> <if test="busType != null and busType != ''">
AND busType = #{busType} AND busType = #{busType}
</if> </if>
@ -68,15 +66,15 @@
</if> </if>
<if test="unionKey != null"> <if test="unionKey != null">
AND ( AND (
icob.billNo like concat('%', #{unionKey}, '%') icob.billNo like concat('%', #{unionKey}, '%')
or icob.fromCorp like concat('%', #{unionKey}, '%') or icob.fromCorp like concat('%', #{unionKey}, '%')
or icob.fromCorpName like concat('%', #{unionKey}, '%') or icob.fromCorpName like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%') or icob.backupOrderRemark1 like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%') or icob.backupOrderRemark2 like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%') or icob.backupOrderRemark3 like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%') or icob.backupOrderRemark4 like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%') or icob.backupOrderRemark5 like concat('%', #{unionKey}, '%')
or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%')) or icob.backupOrderRemark6 like concat('%', #{unionKey}, '%'))
</if> </if>
@ -93,7 +91,7 @@
</foreach> </foreach>
</if> </if>
<if test="invAlert != null"> <if test="invAlert != null">
and icob.invAlert =#{invAlert} and icob.invAlert = #{invAlert}
</if> </if>
<if test="invAlerts != null and invAlerts.size() > 0"> <if test="invAlerts != null and invAlerts.size() > 0">
and icob.invAlert in and icob.invAlert in
@ -106,10 +104,10 @@
</if> </if>
<if test="keyWords != null and keyWords != ''"> <if test="keyWords != null and keyWords != ''">
and (icob.billNo like concat('%', #{keyWords}, '%') and (icob.billNo like concat('%', #{keyWords}, '%')
or icob.fromCorp like concat('%', #{keyWords}, '%') or icob.fromCorp like concat('%', #{keyWords}, '%')
or icob.workPlaceCode like concat('%', #{keyWords}, '%') or icob.workPlaceCode like concat('%', #{keyWords}, '%')
or icob.busType like concat('%', #{keyWords}, '%') or icob.busType like concat('%', #{keyWords}, '%')
or icob.fromType like concat('%', #{keyWords}, '%')) or icob.fromType like concat('%', #{keyWords}, '%'))
</if> </if>
<if test="shipperName != '' and shipperName != null"> <if test="shipperName != '' and shipperName != null">
AND icob.shipperName LIKE concat('%', #{shipperName}, '%') AND icob.shipperName LIKE concat('%', #{shipperName}, '%')
@ -120,19 +118,18 @@
<if test="fromCorpName != '' and fromCorpName != null"> <if test="fromCorpName != '' and fromCorpName != null">
AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%') AND icob.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
</if> </if>
<if test="startTime != null"> <if test="startTime != null and startTime != ''">
<![CDATA[ <![CDATA[
and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S') and icob.billTime >= DATE_FORMAT(#{startTime}, '%Y-%m-%d %H:%i:%S')
]]> ]]>
</if> </if>
<if test="endTime != null"> <if test="endTime != null and endTime != ''">
<![CDATA[ <![CDATA[
and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S') and icob.billTime <= DATE_FORMAT(#{endTime}, '%Y-%m-%d %H:%i:%S')
]]> ]]>
</if> </if>
</where> </where>
GROUP BY GROUP BY icob.billNo
icob.billNo
order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc order by case when icob.orderTime is null then icob.createTime else icob.orderTime end desc
</select> </select>
</mapper> </mapper>

Loading…
Cancel
Save