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

代码备份

Browse Source
dev_no_inv
yewj 10 months ago
parent 8346812955
commit 19cc9a46a6
12 changed files with 66 additions and 50 deletions
Show Stats Download Patch File Download Diff File

9
src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java
Unescape Escape View File

@ -481,6 +481,11 @@ public class IoCodeTempController extends BaseController {
BaseResponse baseResponse = null; BaseResponse baseResponse = null;
addOrderRequest.setCode(code); addOrderRequest.setCode(code);
IoOrderEntity ioOrderEntity = orderService.findCorpOrderId(addOrderCodeRequest.getCorpOrderId());
if (ioOrderEntity != null) {
addOrderRequest.setBillNo(ioOrderEntity.getBillNo());
}
if (IntUtil.value(udiEntity.getProductType()) == 2) { if (IntUtil.value(udiEntity.getProductType()) == 2) {
baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code); baseResponse = adddGrugOrder(addOrderRequest, udiEntity, code);
} else { } else {
@ -2536,11 +2541,11 @@ public class IoCodeTempController extends BaseController {
String orderFinishBillNo = addOrderCodeRequest.getOrderFinishBillNo(); String orderFinishBillNo = addOrderCodeRequest.getOrderFinishBillNo();
List<IoCollectCode> list = ioCollectCodeService.list(new LambdaUpdateWrapper<IoCollectCode>().eq(IoCollectCode::getBillNo, orderFinishBillNo)); List<IoCollectCode> list = ioCollectCodeService.list(new LambdaUpdateWrapper<IoCollectCode>().eq(IoCollectCode::getBillNo, orderFinishBillNo));
if (CollUtil.isEmpty(list)) return ResultVOUtils.error(500, "未找到已完成单的码明细"); if (CollUtil.isEmpty(list)) return ResultVOUtils.error(500, "未找到已完成单的码明细");
List<String> codeList = new ArrayList<>(); List<String> codeList = new ArrayList<>();
list.forEach(item -> { list.forEach(item -> {
String code = item.getCode(); String code = item.getCode();
Integer reCountObj = item.getScanCount(); Integer reCountObj = item.getScanCount();
int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代 int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代
for (int i = 0; i < reCount; i++) { for (int i = 0; i < reCount; i++) {
codeList.add(code); codeList.add(code);

2
src/main/java/com/glxp/api/req/collect/IoSplitDesOrderRequest.java
Unescape Escape View File

@ -40,7 +40,7 @@ public class IoSplitDesOrderRequest extends ListPageRequest {
*/ */
private String endTime; private String endTime;
private String keywords; private String keyWords;
} }

2
src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
Unescape Escape View File

@ -231,4 +231,6 @@ public class FilterOrderRequest extends ListPageRequest {
* 工位编码 * 工位编码
*/ */
private String workPlaceCode; private String workPlaceCode;
private String keyWords;
} }

2
src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
Unescape Escape View File

@ -137,7 +137,7 @@ public class IoSplitCodeRequest extends ListPageRequest {
/** /**
* 关键字搜索 * 关键字搜索
*/ */
private String keywords; private String keyWords;
private String startTime; private String startTime;
private String endTime; private String endTime;

2
src/main/java/com/glxp/api/req/inout/IoSplitFifoInvRequest.java
Unescape Escape View File

@ -117,7 +117,7 @@ public class IoSplitFifoInvRequest extends ListPageRequest {
/** /**
* 关键字搜索 * 关键字搜索
*/ */
private String keywords; private String keyWords;
private String remind; private String remind;
private String cpmctymc; private String cpmctymc;

5
src/main/java/com/glxp/api/service/inout/IoOrderService.java
Unescape Escape View File

@ -102,7 +102,7 @@ public interface IoOrderService {
* @param billNo * @param billNo
* @return * @return
*/ */
List<IoOrderEntity> filterOrderTrace(String billNo,Integer productType); List<IoOrderEntity> filterOrderTrace(String billNo, Integer productType);
/** /**
* 单据实体数据转换VO * 单据实体数据转换VO
@ -158,4 +158,7 @@ public interface IoOrderService {
void updateOrderInventory(String billNo, Integer status); void updateOrderInventory(String billNo, Integer status);
IoOrderEntity findCorpOrderId(String billNo);
} }

9
src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java
Unescape Escape View File

@ -1063,6 +1063,15 @@ public class IoOrderServiceImpl implements IoOrderService {
} }
} }
@Override
public IoOrderEntity findCorpOrderId(String billNo) {
List<IoOrderEntity> orderEntities = orderDao.selectList(new QueryWrapper<IoOrderEntity>().eq("corpOrderId", billNo));
if (CollUtil.isNotEmpty(orderEntities)) {
return orderEntities.get(0);
}
return null;
}
/** /**
* 查询此单据关联的所有单据 * 查询此单据关联的所有单据
* *

17
src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml
Unescape Escape View File

@ -2,7 +2,7 @@
<!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.IoCollectOrderOriginMapper"> <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderOriginMapper">
<select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest" <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderRequest"
resultType="com.glxp.api.res.collect.IoCollectOrderResponse"> resultType="com.glxp.api.res.collect.IoCollectOrderResponse">
SELECT ico.billNo, SELECT ico.billNo,
ico.busType, ico.busType,
@ -102,9 +102,6 @@
<if test="fromCorpName != '' and fromCorpName != null"> <if test="fromCorpName != '' and fromCorpName != null">
AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%') AND ico.fromCorpName LIKE concat('%', #{fromCorpName}, '%')
</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>
@ -157,12 +154,12 @@
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') AND date_format(ico.billTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if> </if>
<!-- <if test="keywords != null and keywords != ''">--> <if test="keyWords != null and keyWords != ''">
<!-- and (ico.billNo like concat('%', #{keywords}, '%')--> and (ico.billNo like concat('%', #{keyWords}, '%')
<!-- or ico.fromCorp like concat('%', #{keywords}, '%')--> or ico.fromCorp like concat('%', #{keyWords}, '%')
<!-- or ico.fromCorpName like concat('%', #{keywords}, '%')--> or ico.fromCorpName like concat('%', #{keyWords}, '%')
<!-- or ico.fromType like concat('%', #{keywords}, '%'))--> or ico.fromType like concat('%', #{keyWords}, '%'))
<!-- </if>--> </if>
</where> </where>
GROUP BY GROUP BY
ico.billNo ico.billNo

8
src/main/resources/mybatis/mapper/collect/IoSplitDesOrderMapper.xml
Unescape Escape View File

@ -25,10 +25,10 @@
AND date_format(isdo.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and AND date_format(isdo.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and
date_format(#{endTime}, '%Y-%m-%d') date_format(#{endTime}, '%Y-%m-%d')
</if> </if>
<if test="keywords != null and keywords != ''"> <if test="keyWords != null and keyWords != ''">
and (isdo.billNo like concat('%', #{keywords}, '%') and (isdo.billNo like concat('%', #{keyWords}, '%')
or isdo.workPlaceCode like concat('%', #{keywords}, '%') or isdo.workPlaceCode like concat('%', #{keyWords}, '%')
or isdo.busType like concat('%', #{keywords}, '%')) or isdo.busType like concat('%', #{keyWords}, '%'))
</if> </if>
</where> </where>
ORDER BY isdo.createTime DESC ORDER BY isdo.createTime DESC

16
src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
Unescape Escape View File

@ -193,14 +193,14 @@
<if test="fromPatientCode != null"> <if test="fromPatientCode != null">
AND io.fromPatientCode = #{fromPatientCode} AND io.fromPatientCode = #{fromPatientCode}
</if> </if>
<if test="keywords != null and keywords != ''"> <if test="keyWords != null and keyWords != ''">
and (io.billNo like concat('%', #{keywords}, '%') and (io.billNo like concat('%', #{keyWords}, '%')
or io.fromCorp like concat('%', #{keywords}, '%') or io.fromCorp like concat('%', #{keyWords}, '%')
or io.workPlaceCode like concat('%', #{keywords}, '%') or io.workPlaceCode like concat('%', #{keyWords}, '%')
or io.busType like concat('%', #{keywords}, '%') or io.busType like concat('%', #{keyWords}, '%')
or sw.workplaceName like concat('%', #{keywords}, '%') or sw.workplaceName like concat('%', #{keyWords}, '%')
or swd.busName like concat('%', #{keywords}, '%') or swd.busName like concat('%', #{keyWords}, '%')
or io.fromType like concat('%', #{keywords}, '%')) or io.fromType like concat('%', #{keyWords}, '%'))
</if> </if>
<if test="supInoivceSearch != null"> <if test="supInoivceSearch != null">

18
src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
Unescape Escape View File

@ -42,15 +42,15 @@
<if test=" productName != null and productName != ''"> <if test=" productName != null and productName != ''">
AND bp.cpmctymc = #{productName} AND bp.cpmctymc = #{productName}
</if> </if>
<if test="keywords != null and keywords != ''"> <if test="keyWords != null and keyWords != ''">
and (isc.workPlaceCode like concat('%', #{keywords}, '%') and (isc.workPlaceCode like concat('%', #{keyWords}, '%')
or isc.nameCode like concat('%', #{keywords}, '%') or isc.nameCode like concat('%', #{keyWords}, '%')
or isc.batchNo like concat('%', #{keywords}, '%') or isc.batchNo like concat('%', #{keyWords}, '%')
or isc.supId like concat('%', #{keywords}, '%') or isc.supId like concat('%', #{keyWords}, '%')
or bp.cpmctymc like concat('%', #{keywords}, '%') or bp.cpmctymc like concat('%', #{keyWords}, '%')
or bp.bzgg like concat('%', #{keywords}, '%') or bp.bzgg like concat('%', #{keyWords}, '%')
or bp.ggxh like concat('%', #{keywords}, '%') or bp.ggxh like concat('%', #{keyWords}, '%')
or isc.invCode like concat('%', #{keywords}, '%')) or isc.invCode like concat('%', #{keyWords}, '%'))
</if> </if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''"> <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(isc.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d') AND date_format(isc.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')

26
src/main/resources/mybatis/mapper/inout/IoSplitFifoInvMapper.xml
Unescape Escape View File

@ -89,20 +89,20 @@
<if test="cpmctymc != null and cpmctymc != ''"> <if test="cpmctymc != null and cpmctymc != ''">
AND bp.cpmctymc like concat('%', #{cpmctymc}, '%') AND bp.cpmctymc like concat('%', #{cpmctymc}, '%')
</if> </if>
<if test="keywords != null and keywords != ''"> <if test="keyWords != null and keyWords != ''">
AND ( AND (
isfi.workPlaceCode like concat('%', #{keywords}, '%') isfi.workPlaceCode like concat('%', #{keyWords}, '%')
or bp.nameCode like concat('%', #{keywords}, '%') or bp.nameCode like concat('%', #{keyWords}, '%')
or isfi.batchNo like concat('%', #{keywords}, '%') or isfi.batchNo like concat('%', #{keyWords}, '%')
or bp.cpmctymc like concat('%', #{keywords}, '%') or bp.cpmctymc like concat('%', #{keyWords}, '%')
or bp.ggxh like concat('%', #{keywords}, '%') or bp.ggxh like concat('%', #{keyWords}, '%')
or bp.bzgg like concat('%', #{keywords}, '%') or bp.bzgg like concat('%', #{keyWords}, '%')
or bp.nameCode like concat('%', #{keywords}, '%') or bp.nameCode like concat('%', #{keyWords}, '%')
or bp.zczbhhzbapzbh like concat('%', #{keywords}, '%') or bp.zczbhhzbapzbh like concat('%', #{keyWords}, '%')
or bp.ylqxzcrbarmc like concat('%', #{keywords}, '%') or bp.ylqxzcrbarmc like concat('%', #{keyWords}, '%')
or bp.manufactory like concat('%',#{keywords},'%') or bp.manufactory like concat('%',#{keyWords},'%')
or bc.name like concat('%',#{keywords},'%') or bc.name like concat('%',#{keyWords},'%')
or swd.busName like concat('%',#{keywords},'%') or swd.busName like concat('%',#{keyWords},'%')
) )
</if> </if>
<if test="remind != null and remind == 'yj' "> <if test="remind != null and remind == 'yj' ">

Write Preview
Loading…
Cancel
Save