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
1178634255 2 years ago
parent dd48ea08fa be6abd2063
commit d6c57a7bf4
5 changed files with 57 additions and 64 deletions
Show Stats Download Patch File Download Diff File

3
src/main/java/com/glxp/api/controller/auth/DeptController.java
Unescape Escape View File

@ -46,7 +46,6 @@ public class DeptController {
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@GetMapping("spms/inv/warehouse/filter") @GetMapping("spms/inv/warehouse/filter")
public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) { public BaseResponse filterInvWarehouse(FilterInvWarehouseRequest filterInvWarehouseRequest) {
@ -260,6 +259,7 @@ public class DeptController {
@Resource @Resource
DeptUserService deptUserService; DeptUserService deptUserService;
@AuthRuleAnnotation("") @AuthRuleAnnotation("")
@PostMapping("/spms/inv/warehouse/delete") @PostMapping("/spms/inv/warehouse/delete")
public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) { public BaseResponse delete(@RequestBody DeleteRequest deleteRequest) {
@ -361,5 +361,4 @@ public class DeptController {
} }
} }

16
src/main/java/com/glxp/api/controller/basic/BasicCorpController.java
Unescape Escape View File

@ -160,19 +160,11 @@ public class BasicCorpController {
basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK); basicUnitMaintainFilterRequest.setOutType(ConstantStatus.CORP_SICK_SICK);
List<BasicCorpEntity> basicUnitMaintainEntities; List<BasicCorpEntity> basicUnitMaintainEntities;
basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest); basicUnitMaintainEntities = basicUnitMaintainService.filterList(basicUnitMaintainFilterRequest);
PageInfo<BasicCorpEntity> pageInfo;
List<BasicUnitMaintainResponse> basicUnitMaintainResponses = basicUnitMaintainEntities.stream().map(item -> pageInfo = new PageInfo<>(basicUnitMaintainEntities);
{ PageSimpleResponse<BasicCorpEntity> pageSimpleResponse = new PageSimpleResponse<>();
BasicUnitMaintainResponse basicUnitMaintainResponse = new BasicUnitMaintainResponse();
BeanUtils.copyProperties(item, basicUnitMaintainResponse);
basicUnitMaintainResponse.setUnitId(item.getErpId());
return basicUnitMaintainResponse;
}).collect(Collectors.toList());
PageInfo<BasicUnitMaintainResponse> pageInfo;
pageInfo = new PageInfo<>(basicUnitMaintainResponses);
PageSimpleResponse<BasicUnitMaintainResponse> pageSimpleResponse = new PageSimpleResponse<>();
pageSimpleResponse.setTotal(pageInfo.getTotal()); pageSimpleResponse.setTotal(pageInfo.getTotal());
pageSimpleResponse.setList(basicUnitMaintainResponses); pageSimpleResponse.setList(basicUnitMaintainEntities);
return ResultVOUtils.success(pageSimpleResponse); return ResultVOUtils.success(pageSimpleResponse);
} }

98
src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java
Unescape Escape View File

@ -801,7 +801,6 @@ public class IoCheckInoutService {
orderEntity.setUpdateTime(new Date()); orderEntity.setUpdateTime(new Date());
orderEntity.setAuditTime(new Date()); orderEntity.setAuditTime(new Date());
orderService.update(orderEntity); orderService.update(orderEntity);
List<IoCodeEntity> codeEntities = codeService.findByOrderId(orderEntity.getBillNo());
genInv(orderEntity, bussinessTypeEntity); genInv(orderEntity, bussinessTypeEntity);
} }
} }
@ -935,53 +934,58 @@ public class IoCheckInoutService {
@Resource @Resource
InvWarehouseService invWarehouseService; InvWarehouseService invWarehouseService;
public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> backCodeList) { public void genBackOrder(IoOrderEntity orderEntity, List<IoCodeEntity> allCodeList) {
if (CollUtil.isEmpty(backCodeList)) if (CollUtil.isEmpty(allCodeList))
return; return;
BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); Map<String, List<IoCodeEntity>> map = allCodeList.stream().collect(Collectors.groupingBy(t -> t.getSupId()));
if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) { for (Map.Entry<String, List<IoCodeEntity>> entry : map.entrySet()) {
IoOrderEntity outOrder = new IoOrderEntity(); List<IoCodeEntity> backCodeList = entry.getValue();
IoCodeEntity codeEntity = backCodeList.get(0); BasicBussinessTypeEntity basicBussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction());
outOrder.setId(null); if (StrUtil.isNotEmpty(basicBussinessTypeEntity.getPreInBackAction())) {
outOrder.setMainAction(ConstantType.TYPE_OUT); IoOrderEntity outOrder = new IoOrderEntity();
outOrder.setAction(basicBussinessTypeEntity.getPreInBackAction()); IoCodeEntity codeEntity = backCodeList.get(0);
InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE); outOrder.setId(null);
outOrder.setInvCode(invWarehouseEntity.getCode()); outOrder.setMainAction(ConstantType.TYPE_OUT);
outOrder.setDeptCode(invWarehouseEntity.getParentId()); outOrder.setAction(basicBussinessTypeEntity.getPreInBackAction());
outOrder.setFromCorp(codeEntity.getSupId()); InvWarehouseEntity invWarehouseEntity = invWarehouseService.findByInvSubByCode(Constant.INV_PRE_IN_CODE);
outOrder.setOrderType(2); outOrder.setInvCode(invWarehouseEntity.getCode());
outOrder.setCreateTime(new Date()); outOrder.setDeptCode(invWarehouseEntity.getParentId());
outOrder.setFromType(ConstantStatus.FROM_BACK); outOrder.setFromCorp(codeEntity.getSupId());
String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd")); outOrder.setOrderType(2);
outOrder.setBillNo(orderNo); outOrder.setCreateTime(new Date());
outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID); outOrder.setFromType(ConstantStatus.FROM_BACK);
outOrder.setCorpOrderId(CustomUtil.getId() + "x"); String orderNo = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER + StrUtil.trimToEmpty(basicBussinessTypeEntity.getPrefix()), "yyyyMMdd"));
outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS); outOrder.setBillNo(orderNo);
orderEntity.setUllageSupNo(outOrder.getBillNo()); outOrder.setCustomerId(Constant.SYSTEM_CUSTOMER_ID);
orderEntity.setUpdateTime(new Date()); outOrder.setCorpOrderId(CustomUtil.getId() + "x");
orderService.update(orderEntity); outOrder.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
outOrder.setOriginUllageSupNo(orderEntity.getBillNo()); orderEntity.setUllageSupNo(outOrder.getBillNo());
outOrder.setCreateUser(null); orderEntity.setUpdateTime(new Date());
outOrder.setReviewUser(null); orderService.update(orderEntity);
orderService.insertOrder(outOrder); outOrder.setOriginUllageSupNo(orderEntity.getBillNo());
outOrder.setCreateUser(null);
//生成条码 outOrder.setReviewUser(null);
List<IoCodeTempEntity> codeTempEntities = new ArrayList<>(); orderService.insertOrder(outOrder);
for (IoCodeEntity warehouseEntity : backCodeList) {
IoCodeTempEntity codeTempEntity = new IoCodeTempEntity(); //生成条码
BeanUtils.copyProperties(warehouseEntity, codeTempEntity); List<IoCodeTempEntity> codeTempEntities = new ArrayList<>();
codeTempEntity.setId(null); for (IoCodeEntity warehouseEntity : backCodeList) {
codeTempEntity.setOrderId(outOrder.getBillNo()); IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
codeTempEntity.setAction(outOrder.getAction()); BeanUtils.copyProperties(warehouseEntity, codeTempEntity);
codeTempEntity.setMainAction(outOrder.getMainAction()); codeTempEntity.setId(null);
codeTempEntity.setCreateTime(new Date()); codeTempEntity.setOrderId(outOrder.getBillNo());
codeTempEntity.setUpdateTime(new Date()); codeTempEntity.setAction(outOrder.getAction());
codeTempEntities.add(codeTempEntity); codeTempEntity.setMainAction(outOrder.getMainAction());
} codeTempEntity.setCreateTime(new Date());
codeTempService.insertBatch(codeTempEntities); codeTempEntity.setUpdateTime(new Date());
addInoutService.dealProcess(outOrder); codeTempEntities.add(codeTempEntity);
if (!checkManual(outOrder.getBillNo())) { }
check(outOrder.getBillNo()); codeTempService.insertBatch(codeTempEntities);
addInoutService.dealProcess(outOrder);
if (!checkManual(outOrder.getBillNo())) {
check(outOrder.getBillNo());
}
} }
} }

1
src/main/java/com/glxp/api/service/inv/impl/InvCountOrderDetailServiceImpl.java
Unescape Escape View File

@ -110,6 +110,7 @@ public class InvCountOrderDetailServiceImpl implements InvCountOrderDetailServic
InvCountCodesEntity codesEntity = codesMap.get(code); InvCountCodesEntity codesEntity = codesMap.get(code);
if (null == codesEntity) { if (null == codesEntity) {
//构造条码信息 //构造条码信息
codesEntity = new InvCountCodesEntity();
codesEntity.setCode(code); codesEntity.setCode(code);
codesEntity.setOrderIdFk(orderId); codesEntity.setOrderIdFk(orderId);
codesEntity.setCount(1); codesEntity.setCount(1);

3
src/main/resources/mybatis/mapper/basic/BasicCorpDao.xml
Unescape Escape View File

@ -24,9 +24,6 @@
<if test="id != '' and id != null"> <if test="id != '' and id != null">
AND id = #{id} AND id = #{id}
</if> </if>
<if test="unitId != '' and unitId != null">
AND unitId = #{unitId}
</if>
<if test="erpId != '' and erpId != null"> <if test="erpId != '' and erpId != null">
AND erpId = #{erpId} AND erpId = #{erpId}
</if> </if>

Write Preview
Loading…
Cancel
Save