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
wj 2 years ago
parent eb470c4c55 a198add3af
commit 508caa86e0
11 changed files with 206 additions and 14 deletions
Show Stats Download Patch File Download Diff File

34
src/main/java/com/glxp/api/controller/inv/InvPlaceController.java
Unescape Escape View File

@ -16,6 +16,7 @@ import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPlaceOrderDetailResponse;
import com.glxp.api.service.inv.InvPlaceOrderService;
import com.glxp.api.service.inv.InvPlaceService;
import org.apache.commons.collections.ArrayStack;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -23,7 +24,9 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.validation.Valid;
import java.lang.reflect.Array;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
/**
@ -237,5 +240,36 @@ public class InvPlaceController {
return ResultVOUtils.page(pageInfo);
}
/**
* 查询库存摆放记录
*
* @return
*/
@GetMapping("/spms/inv/product/selectPlaceList")
public BaseResponse selectPlaceList(FilterInvPlaceRequest filterInvPlaceRequest) {
List<InvPlaceDetailResponse> invPlaceDetailResponseList=new ArrayStack();
if(StrUtil.isNotBlank(filterInvPlaceRequest.getCode())){
List<String> list= Arrays.asList(filterInvPlaceRequest.getCode().split("#"));
if(list!=null && list.size()>=3){
if(list.get(2) !=null && !list.get(2).equals("null")){
//用产品查询
filterInvPlaceRequest.setCode(list.get(2));
invPlaceDetailResponseList= invPlaceOrderService.filterProductList(filterInvPlaceRequest);
}else if(list.get(0) !=null && list.get(1)!=null && !list.get(0).equals("null") && !list.get(1).equals("null") ){
//用货位查询
filterInvPlaceRequest.setInvCode(list.get(0));
filterInvPlaceRequest.setInvSpaceCode(list.get(1));
filterInvPlaceRequest.setCode(null);
invPlaceDetailResponseList= invPlaceOrderService.filterSpaceList(filterInvPlaceRequest);
}else{
return ResultVOUtils.error(999,"扫码错误！");
}
}
}
PageInfo<InvPlaceDetailResponse> pageInfo = new PageInfo<>(invPlaceDetailResponseList);
return ResultVOUtils.page(pageInfo);
}
}

3
src/main/java/com/glxp/api/dao/inv/InvPreInProductDetailDao.java
Unescape Escape View File

@ -46,4 +46,7 @@ public interface InvPreInProductDetailDao extends BaseMapperPlus<InvPreInProduct
Integer getInventoryQuantity(@Param("code") String code);
//用货架查询
List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
}

3
src/main/java/com/glxp/api/dao/inv/InvPreProductDetailDao.java
Unescape Escape View File

@ -45,4 +45,7 @@ public interface InvPreProductDetailDao extends BaseMapperPlus<InvPreProductDeta
List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
Integer getInventoryQuantity(@Param("code") String code);
//用货架查询
List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
}

3
src/main/java/com/glxp/api/dao/inv/InvProductDetailDao.java
Unescape Escape View File

@ -98,4 +98,7 @@ public interface InvProductDetailDao extends BaseMapperPlus<InvProductDetailDao,
List<IoOrderResponse> getInvPlaceOrderList(FilterInvPlaceRequest filterInvPlaceRequest);
Integer getInventoryQuantity(@Param("code") String code);
//用货架查询
List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
}

4
src/main/java/com/glxp/api/res/inv/InvPlaceDetailResponse.java
Unescape Escape View File

@ -118,4 +118,8 @@ public class InvPlaceDetailResponse {
*/
private String manufactory;
private Integer count;
private String cpmctymc;
}

7
src/main/java/com/glxp/api/service/inv/InvPlaceOrderService.java
Unescape Escape View File

@ -7,6 +7,7 @@ import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
import com.glxp.api.req.inv.FilterInvPlaceRequest;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.res.inv.BindInvSpaceRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPlaceOrderDetailResponse;
import com.glxp.api.res.inv.InvPlaceOrderResponse;
@ -32,4 +33,10 @@ public interface InvPlaceOrderService {
List<InvPlaceOrderDetailResponse> filterInvPlaceOrderDetailList(FilterInvPlaceOrderRequest filterInvPlaceOrderRequest);
//用产品查询
List<InvPlaceDetailResponse> filterProductList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
//用货架查询
List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceOrderRequest);
}

57
src/main/java/com/glxp/api/service/inv/impl/InvPlaceOrderServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.inv.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
@ -18,6 +19,7 @@ import com.glxp.api.req.inv.FilterInvPlaceOrderRequest;
import com.glxp.api.req.inv.FilterInvPlaceRequest;
import com.glxp.api.res.inout.IoOrderResponse;
import com.glxp.api.res.inv.BindInvSpaceRequest;
import com.glxp.api.res.inv.InvPlaceDetailResponse;
import com.glxp.api.res.inv.InvPlaceOrderDetailResponse;
import com.glxp.api.res.inv.InvPlaceOrderResponse;
import com.glxp.api.service.auth.CustomerService;
@ -26,6 +28,7 @@ import com.glxp.api.service.inv.InvPlaceOrderService;
import com.glxp.api.util.GennerOrderUtils;
import com.glxp.api.util.OrderNoTypeBean;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -34,6 +37,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@Slf4j
@Service
@ -129,8 +133,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
QueryWrapper<InvPreInProductDetailEntity> ew = new QueryWrapper<>();
ew.eq("code", bindInvSpaceRequest.getCode());
if(bindInvSpaceRequest.getType()==3){
ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
if (bindInvSpaceRequest.getType() == 3) {
ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
}
ew.last("limit 1");
InvPreInProductDetailEntity invPreInProductDetailEntity = invPreInProductDetailDao.selectOne(ew);
@ -144,8 +148,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
} else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
QueryWrapper<InvPreProductDetailEntity> ew = new QueryWrapper<>();
ew.eq("code", bindInvSpaceRequest.getCode());
if(bindInvSpaceRequest.getType()==3){
ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
if (bindInvSpaceRequest.getType() == 3) {
ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
}
ew.last("limit 1");
InvPreProductDetailEntity invPreInProductDetailEntity = invPreProductDetailDao.selectOne(ew);
@ -159,8 +163,8 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
} else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_NORMAL) {
QueryWrapper<InvProductDetailEntity> ew = new QueryWrapper<>();
ew.eq("code", bindInvSpaceRequest.getCode());
if(bindInvSpaceRequest.getType()==3){
ew.eq("invSpaceCode",bindInvSpaceRequest.getInvSpaceCode());
if (bindInvSpaceRequest.getType() == 3) {
ew.eq("invSpaceCode", bindInvSpaceRequest.getInvSpaceCode());
}
ew.last("limit 1");
InvProductDetailEntity invPreInProductDetailEntity = invProductDetailDao.selectOne(ew);
@ -203,9 +207,9 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
invPlaceOrderDetailEntity.setProduceDate(produceDate);
invPlaceOrderDetailEntity.setSupId(supId);
invPlaceOrderDetailEntity.setInvCode(bindInvSpaceRequest.getInvCode());
if(bindInvSpaceRequest.getType()==3){
if (bindInvSpaceRequest.getType() == 3) {
invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
}else{
} else {
invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
}
invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode());
@ -234,9 +238,9 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
invPlaceOrderDetailEntity.setExpireDate(expireDate);
invPlaceOrderDetailEntity.setProduceDate(produceDate);
invPlaceOrderDetailEntity.setSupId(supId);
if(bindInvSpaceRequest.getType()==3){
if (bindInvSpaceRequest.getType() == 3) {
invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getChangeSpaceCode());
}else{
} else {
invPlaceOrderDetailEntity.setInvSpaceCode(bindInvSpaceRequest.getInvSpaceCode());
}
invPlaceOrderDetailEntity.setCode(bindInvSpaceRequest.getCode());
@ -339,7 +343,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
invPlaceOrderDetailEntity.setRecordId(recordId);
invPlaceOrderDetailEntity.setBatchNo(filterInvPlaceOrderRequest.getBatchNo());
invPlaceOrderDetailEntity.setCode(filterInvPlaceOrderRequest.getCode());
invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId()+"");
invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId() + "");
invPlaceOrderDetailEntity.setNameCode(filterInvPlaceOrderRequest.getNameCode());
invPlaceOrderDetailEntity.setExpireDate(filterInvPlaceOrderRequest.getExpireDate());
invPlaceOrderDetailEntity.setProduceDate(filterInvPlaceOrderRequest.getProduceDate());
@ -358,7 +362,7 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
invPlaceOrderDetailEntity.setRecordId(recordId);
invPlaceOrderDetailEntity.setCode(filterInvPlaceOrderRequest.getCode());
invPlaceOrderDetailEntity.setBatchNo(filterInvPlaceOrderRequest.getBatchNo());
invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId()+"");
invPlaceOrderDetailEntity.setRelId(filterInvPlaceOrderRequest.getRelId() + "");
invPlaceOrderDetailEntity.setNameCode(filterInvPlaceOrderRequest.getNameCode());
invPlaceOrderDetailEntity.setExpireDate(filterInvPlaceOrderRequest.getExpireDate());
invPlaceOrderDetailEntity.setProduceDate(filterInvPlaceOrderRequest.getProduceDate());
@ -507,4 +511,33 @@ public class InvPlaceOrderServiceImpl implements InvPlaceOrderService {
}
return invPlaceOrderDetailDao.selectDetailList(filterInvPlaceOrderRequest.getOrderId());
}
@Override
public List<InvPlaceDetailResponse> filterProductList(FilterInvPlaceRequest filterInvPlaceRequest) {
List<InvPlaceDetailResponse> list = invPreInProductDetailDao.filterSpaceList(filterInvPlaceRequest);
List<InvPlaceDetailResponse> list2 = invPreProductDetailDao.filterSpaceList(filterInvPlaceRequest);
List<InvPlaceDetailResponse> list3 = invProductDetailDao.filterSpaceList(filterInvPlaceRequest);
list.addAll(list2);
list.addAll(list3);
return list;
}
@Override
public List<InvPlaceDetailResponse> filterSpaceList(FilterInvPlaceRequest filterInvPlaceRequest) {
InvWarehouseEntity invWarehouseEntity = invWarehouseDao.selectOne(new QueryWrapper<InvWarehouseEntity>().eq("code", filterInvPlaceRequest.getInvCode()));
if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_PREIN) {
List<InvPlaceDetailResponse> list = invPreInProductDetailDao.filterSpaceList(filterInvPlaceRequest);
return list;
} else if (invWarehouseEntity.getAdvanceType() == ConstantStatus.ACTION_TYPE_ADVANCE) {
List<InvPlaceDetailResponse> list = invPreProductDetailDao.filterSpaceList(filterInvPlaceRequest);
return list;
} else {
List<InvPlaceDetailResponse> list = invProductDetailDao.filterSpaceList(filterInvPlaceRequest);
return list;
}
}
}

2
src/main/java/com/glxp/api/service/inv/impl/InvPlaceServiceImpl.java
Unescape Escape View File

@ -478,8 +478,6 @@ public class InvPlaceServiceImpl implements InvPlaceService {
return invPreProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
} else
return invProductDetailDao.getInvPlaceOrderList(filterInvPlaceRequest);
}
@Override

37
src/main/resources/mybatis/mapper/inv/InvPreInProductDetailDao.xml
Unescape Escape View File

@ -233,4 +233,41 @@
and (invSpaceCode is null or invSpaceCode = '' )
</select>
<select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
SELECT
t1.nameCode,
t1.relId,
( SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode ) AS deptName,
( SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode ) AS invName,
( SELECT NAME FROM auth_space WHERE auth_space.`code` = t1.invSpaceCode ) AS invSpaceName,
SUM( t1.reCount ) as count,
bp.cpmctymc as productName,
bp.ggxh,
t1.batchNo,
t1.produceDate as productionDate,
t1.expireDate,
bp.measname,
bp.zczbhhzbapzbh,
bp.ylqxzcrbarmc,
bp.manufactory,
( SELECT `name` FROM basic_corp WHERE erpId = t1.supId ) supName
FROM
inv_prein_product_detail t1
LEFT JOIN basic_udirel bu ON bu.id = t1.relId
LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
<where>
<if test="code != null and code != ''">
AND t1.code = #{code}
and t1.invSpaceCode IS NOT NULL
and t1.invSpaceCode!=''
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND t1.invSpaceCode = #{invSpaceCode}
</if>
</where>
GROUP BY
CODE,
invSpaceCode
</select>
</mapper>

35
src/main/resources/mybatis/mapper/inv/InvPreProductDetailDao.xml
Unescape Escape View File

@ -232,4 +232,39 @@
CODE = #{code}
and (invSpaceCode is null or invSpaceCode = '' )
</select>
<select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
SELECT
t1.nameCode,
t1.relId,
( SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode ) AS deptName,
( SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode ) AS invName,
( SELECT NAME FROM auth_space WHERE auth_space.`code` = t1.invSpaceCode ) AS invSpaceName,
SUM( t1.reCount ) as count,
bp.cpmctymc as productName,
bp.ggxh,
t1.batchNo,
t1.produceDate as productionDate,
t1.expireDate,
bp.measname,
bp.zczbhhzbapzbh,
bp.ylqxzcrbarmc,
bp.manufactory,
( SELECT `name` FROM basic_corp WHERE erpId = t1.supId ) supName
FROM
inv_pre_product_detail t1
LEFT JOIN basic_udirel bu ON bu.id = t1.relId
LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
<where>
<if test="code != null and code != ''">
AND t1.code = #{code}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND t1.invSpaceCode = #{invSpaceCode}
</if>
</where>
GROUP BY
CODE,
invSpaceCode
</select>
</mapper>

35
src/main/resources/mybatis/mapper/inv/invProductDetailDao.xml
Unescape Escape View File

@ -314,4 +314,39 @@
CODE = #{code}
and (invSpaceCode is null or invSpaceCode = '' )
</select>
<select id="filterSpaceList" resultType="com.glxp.api.res.inv.InvPlaceDetailResponse">
SELECT
t1.nameCode,
t1.relId,
( SELECT NAME FROM auth_dept WHERE auth_dept.`code` = t1.deptCode ) AS deptName,
( SELECT NAME FROM auth_warehouse WHERE auth_warehouse.`code` = t1.invCode ) AS invName,
( SELECT NAME FROM auth_space WHERE auth_space.`code` = t1.invSpaceCode ) AS invSpaceName,
SUM( t1.reCount ) as count,
bp.cpmctymc as productName,
bp.ggxh,
t1.batchNo,
t1.produceDate as productionDate,
t1.expireDate,
bp.measname,
bp.zczbhhzbapzbh,
bp.ylqxzcrbarmc,
bp.manufactory,
( SELECT `name` FROM basic_corp WHERE erpId = t1.supId ) supName
FROM
inv_product_detail t1
LEFT JOIN basic_udirel bu ON bu.id = t1.relId
LEFT JOIN basic_products bp ON bp.uuid = bu.uuid
<where>
<if test="code != null and code != ''">
AND t1.code = #{code}
</if>
<if test="invSpaceCode != null and invSpaceCode != ''">
AND t1.invSpaceCode = #{invSpaceCode}
</if>
</where>
GROUP BY
CODE,
invSpaceCode
</select>
</mapper>

Write Preview
Loading…
Cancel
Save