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

设备领用代码提交

Browse Source
dev2.0
郑明梁 2 years ago
parent 14254daeb7
commit 671131105a
11 changed files with 86 additions and 77 deletions
Show Stats Download Patch File Download Diff File

2
src/main/java/com/glxp/api/entity/inv/DeviceReceiveOrderEntity.java
Unescape Escape View File

@ -15,7 +15,7 @@ public class DeviceReceiveOrderEntity {
/**
* id
*/
@TableId(value = "id", type = IdType.INPUT)
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
/**

13
src/main/java/com/glxp/api/req/inv/FilterDeviceReceiveOrderRequest.java
Unescape Escape View File

@ -42,4 +42,17 @@ public class FilterDeviceReceiveOrderRequest extends ListPageRequest {
private String templateId;
/**
* 开始时间
*/
private String startTime;
/**
* 结束时间
*/
private String endTime;
private String receiveUserName;
}

2
src/main/java/com/glxp/api/req/inv/FilterInvProductDetailRequest.java
Unescape Escape View File

@ -11,6 +11,8 @@ import java.util.List;
@Data
public class FilterInvProductDetailRequest extends ListPageRequest {
private int id;
/**
* UDI码
*/

6
src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
Unescape Escape View File

@ -108,4 +108,10 @@ public class FilterInvProductRequest extends ListPageRequest {
*/
private Integer filterCount;
private String code;
private String serialNo;
private String manufactory;
}

1
src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java
Unescape Escape View File

@ -106,6 +106,7 @@ public class UdiRelevanceResponse {
private String unitFk; //供应商ID
private String companyName; //供应商名称
//手持终端下载需要主键
private Long relId;
private boolean dispatch; //是否可配送

8
src/main/java/com/glxp/api/res/inv/InvProductResponse.java
Unescape Escape View File

@ -38,7 +38,7 @@ public class InvProductResponse {
/**
* 生产日期
*/
private String productionDate;
private String produceDate;
/**
* 过期时间
@ -113,6 +113,12 @@ public class InvProductResponse {
private String code;
private String serialNo;
private String manufactoryl;
/*
* 计量单位

58
src/main/java/com/glxp/api/service/inv/impl/DeviceReceiveOrderDetailServiceImpl.java
Unescape Escape View File

@ -110,61 +110,11 @@ public class DeviceReceiveOrderDetailServiceImpl implements DeviceReceiveOrderDe
//通过选库存添加
//查询选中的库存信息
for (String invProductId : addDetailRequest.getInvProductIds()) {
InvProductEntity invProductEntity = invProductDao.selectById(invProductId);
//查询库存详情
FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
filterInvProductDetailRequest.setRelId(String.valueOf(invProductEntity.getRelIdFk()));
filterInvProductDetailRequest.setBatchNo(invProductEntity.getBatchNo());
filterInvProductDetailRequest.setDeptCode(invProductEntity.getDeptCode());
filterInvProductDetailRequest.setInvCode(invProductEntity.getInvCode());
filterInvProductDetailRequest.setInvSpaceCode(addDetailRequest.getInvSpaceCode());
filterInvProductDetailRequest.setSupId(addDetailRequest.getSupId());
List<InvProductDetailEntity> invProductDetailEntities = invProductDetailDao.filterInvProductDetailList(filterInvProductDetailRequest);
//计算出在仓库中的设备
//提取库存详情中不同的码
List<String> codesList = invProductDetailEntities.stream().map(InvProductDetailEntity::getCode).distinct().collect(Collectors.toList());
//初始化所有码数量集合
Map<String, Integer> codeMap = new HashMap<>(codesList.size());
codesList.forEach(code -> codeMap.put(code, 0));
//计算库存详情中的码明细，得出所有存在于库存中的码
for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
Integer count = codeMap.get(invProductDetailEntity.getCode());
if (invProductDetailEntity.getMainAction().equals(ConstantType.TYPE_PUT)) {
//入库，数量 +1
count = count + 1;
} else {
//出库， 数量 -1
count = count - 1;
}
codeMap.put(invProductDetailEntity.getCode(), count);
}
//根据计算得出的，所有存在于库存中的码明细，生成设备领用记录详情
for (String code : codeMap.keySet()) {
if (codeMap.get(code) > 0) {
//查找此条码对应的库存详情数据，根据此库存详情数据，查找仓库货位等信息
InvProductDetailEntity invProductDetailEntity = new InvProductDetailEntity();
for (InvProductDetailEntity detailEntity : invProductDetailEntities) {
if (detailEntity.getCode().equals(code)) {
invProductDetailEntity = detailEntity;
break;
}
}
//此条码存在于库存中,解析条码生成设备领用记录详情
Integer count = codeMap.get(code);
if (count > 1) {
for (int i = 0; i < count; i++) {
DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductDetailEntity);
//插入设备领用记录详情
deviceReceiveOrderDetailDao.insert(orderDetail);
}
} else {
DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), code, invProductDetailEntity);
deviceReceiveOrderDetailDao.insert(orderDetail);
}
}
}
InvProductDetailEntity invProductDetailEntities = invProductDetailDao.selectById(Integer.valueOf(invProductId));
DeviceReceiveOrderDetailEntity orderDetail = getDeviceReceiveOrderDetailEntity(addDetailRequest.getOrderIdFk(), invProductDetailEntities.getCode(), invProductDetailEntities);
//插入设备领用记录详情
deviceReceiveOrderDetailDao.insert(orderDetail);
}
}else{
for (String invProductId : addDetailRequest.getInvProductIds()) {

15
src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml
Unescape Escape View File

@ -57,16 +57,21 @@
basic_products.basicPrductRemak5,
basic_products.basicPrductRemak6,
basic_products.basicPrductRemak7,
basic_products.basicPrductRemak8
basic_products.basicPrductRemak8,
basic_corp.name as companyName
FROM basic_udirel
inner JOIN basic_products
ON basic_products.uuid = basic_udirel.uuid
inner JOIN basic_products ON basic_products.uuid = basic_udirel.uuid
left join company_product_relevance on basic_udirel.id = company_product_relevance.udiRlIdFk
left JOIN basic_corp on basic_corp.erpId = company_product_relevance.customerId
<where>
<if test="ylqxzcrbarmc != '' and ylqxzcrbarmc != null">
AND ylqxzcrbarmc LIKE concat('%', #{ylqxzcrbarmc}, '%')
</if>
<if test="supName != '' and supName != null">
AND supName LIKE concat('%', #{supName}, '%')
<if test="manufactory != '' and manufactory != null">
AND basic_products.manufactory LIKE concat('%', #{manufactory}, '%')
</if>
<if test="companyName != '' and companyName != null">
AND basic_corp.name LIKE concat('%', #{companyName}, '%')
</if>
<if test="cpmctymc != '' and cpmctymc != null">
AND cpmctymc LIKE concat('%', #{cpmctymc}, '%')

12
src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDao.xml
Unescape Escape View File

@ -13,15 +13,15 @@
dro.STATUS,
dro.fromInvSpaceCode,
dro.receiveUser,
( SELECT employeeName FROM auth_user WHERE id = dro.receiveUser ) receiveUserName,
au.employeeName as receiveUserName,
( SELECT `name` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptName,
( SELECT `code` FROM auth_dept WHERE CODE = dro.fromDeptCode ) fromDeptCode,
( SELECT `name` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvName,
( SELECT `code` FROM auth_warehouse WHERE CODE = dro.fromInvCode ) fromInvCode,
( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName,
( SELECT employeeName FROM auth_user WHERE userName = dro.createUser ) createUserName
( SELECT `name` FROM auth_space WHERE CODE = dro.fromInvSpaceCode ) fromInvSpaceName
FROM
device_receive_order dro
left join auth_user au on au.id = dro.receiveUser
<where>
<if test="status != null">
AND status = #{status}
@ -38,6 +38,12 @@
<if test="fromInvSpaceCode != null and fromInvSpaceCode != ''">
AND fromInvSpaceCode = #{fromInvSpaceCode}
</if>
<if test="receiveUserName != null and receiveUserName != ''">
AND au.employeeName like concat('%', #{receiveUserName}, '%')
</if>
<if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
AND date_format(dro.createTime, '%Y-%m-%d') between date_format(#{startTime}, '%Y-%m-%d') and date_format(#{endTime}, '%Y-%m-%d')
</if>
</where>
order by updateTime desc
</select>

1
src/main/resources/mybatis/mapper/inv/DeviceReceiveOrderDetailDao.xml
Unescape Escape View File

@ -74,6 +74,7 @@
AND drod.originCode = #{code}
</if>
</where>
group by bu.uuid
</select>
<select id="selectList" resultType="com.glxp.api.entity.inv.DeviceReceiveOrderDetailEntity">

45
src/main/resources/mybatis/mapper/inv/invProductDao.xml
Unescape Escape View File

@ -148,16 +148,25 @@
</select>
<select id="getMAInvProducts" resultType="com.glxp.api.res.inv.InvProductResponse">
select ip.id, bp.nameCode, bp.cpmctymc, bp.ggxh, ip.batchNo, ip.productionDate, ip.expireDate,basic_corp.name supName
from inv_product ip
left join inv_product_detail ipd
on ip.relIdFk = ipd.relId and
ifnull(ip.batchNo, 'empty') = ifnull(ipd.batchNo, 'empty')
left join basic_udirel bu on bu.id = ip.relIdFk
left join basic_products bp on bu.uuid = bp.uuid
left join basic_corp on ip.supId = basic_corp.erpId
SELECT
ip.id,
bp.nameCode,
bp.cpmctymc,
bp.ggxh,
ip.batchNo,
ip.code,
ip.produceDate,
ip.expireDate,
ip.serialNo,
basic_corp.NAME supName,
bp.manufactory ,
bp.zczbhhzbapzbh
FROM
inv_product_detail ip
LEFT JOIN basic_udirel bu ON bu.id = ip.relId
LEFT JOIN basic_products bp ON bu.uuid = bp.uuid
LEFT JOIN basic_corp ON ip.supId = basic_corp.erpId
<where>
(ip.inCount - ip.outCount) > 0
<if test="nameCode != null and nameCode != ''">
AND bp.nameCode like concat('%', #{nameCode}, '%')
</if>
@ -170,14 +179,24 @@
<if test="invCode != null and invCode != ''">
AND ip.invCode = #{invCode}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND ipd.invSpaceCode = #{invSpaceCode}
</if>
<if test="cplb != null and cplb != ''">
AND bp.cplb = #{cplb}
</if>
<if test="manufactory != null and manufactory != ''">
AND bp.manufactory = #{manufactory}
</if>
<if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
AND bp.zczbhhzbapzbh = #{zczbhhzbapzbh}
</if>
<if test="supName != null and supName != ''">
AND basic_corp.NAME like concat('%', #{supName}, '%')
</if>
<if test="invCode != null and invCode != ''">
AND ip.invCode = #{invCode}
</if>
</where>
group by ip.id
GROUP BY ip.`code`, ip.supId
ORDER BY ip.`code`
</select>
<select id="selectProductInfo" resultType="com.glxp.api.entity.inv.InvProductEntity">

Write Preview
Loading…
Cancel
Save