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

Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

Browse Source
dev_unify
yewj 8 months ago
parent e6b631a5c7 fa706b6abb
commit a8db4fcdc3
10 changed files with 70 additions and 9 deletions
Show Stats Download Patch File Download Diff File

48
src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java
Unescape Escape View File

@ -13,6 +13,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation;
import com.glxp.api.common.enums.ResultEnum;
import com.glxp.api.common.res.BaseResponse;
import com.glxp.api.common.util.ResultVOUtils;
import com.glxp.api.constant.FileConstant;
import com.glxp.api.controller.BaseController;
import com.glxp.api.dto.DictDto;
import com.glxp.api.entity.auth.AuthAdmin;
@ -21,6 +22,9 @@ import com.glxp.api.entity.auth.SysWorkplace;
import com.glxp.api.entity.auth.WarehouseUserEntity;
import com.glxp.api.entity.basic.BasicCollectPointEntity;
import com.glxp.api.entity.basic.SysWorkplaceDocumentEntity;
import com.glxp.api.entity.basic.SysWorkplaceQueue;
import com.glxp.api.entity.purchase.SupCertEntity;
import com.glxp.api.entity.purchase.SupCompanyEntity;
import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity;
import com.glxp.api.entity.system.SystemPDFTemplateEntity;
import com.glxp.api.exception.JsonException;
@ -30,18 +34,21 @@ import com.glxp.api.req.auth.SysWorkplaceRequest;
import com.glxp.api.req.basic.BasicCollectUserRequest;
import com.glxp.api.req.basic.WorkBindBusTypeRequest;
import com.glxp.api.req.dev.DeviceInfoDetailQuery;
import com.glxp.api.req.purchase.purPlanPrintRequest;
import com.glxp.api.req.system.PrintLabelRequest;
import com.glxp.api.res.PageSimpleResponse;
import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
import com.glxp.api.res.basic.SysWorkplaceResponse;
import com.glxp.api.res.basic.UserWorkResponse;
import com.glxp.api.res.basic.WorkBindWorkResponse;
import com.glxp.api.res.dev.DeviceReceiveOrderDetailResponse;
import com.glxp.api.service.auth.AuthAdminService;
import com.glxp.api.service.auth.DeptService;
import com.glxp.api.service.auth.SysWorkplaceService;
import com.glxp.api.service.auth.WarehouseUserService;
import com.glxp.api.service.basic.BasicCollectUserService;
import com.glxp.api.service.basic.SysWorkplaceDocumentService;
import com.glxp.api.service.basic.SysWorkplaceQueueService;
import com.glxp.api.service.system.SystemPDFModuleService;
import com.glxp.api.service.system.SystemPDFTemplateService;
import com.glxp.api.util.JasperUtils;
@ -57,6 +64,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@ -82,6 +90,9 @@ public class SysWorkplaceController extends BaseController {
@Resource
DeptService deptService;
@Resource
SysWorkplaceQueueService sysWorkplaceQueueService;
@PostMapping("/udiwms/sysWorkplace/page")
public BaseResponse page(@RequestBody SysWorkplaceRequest request) {
@ -321,4 +332,41 @@ public class SysWorkplaceController extends BaseController {
pageSimpleResponse.setList(page);
return ResultVOUtils.success(pageSimpleResponse);
}
@AuthRuleAnnotation("")
@PostMapping("/udiwms/sysWorkplace/printQueues")
public BaseResponse printQueues(@RequestBody SysWorkplaceResponse sysWorkplace,HttpServletRequest request, HttpServletResponse response) throws Exception {
SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplace.getLabelId() + "");
if (null == sysPdfTemplateRelevanceLabelEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "所属模块错误");
}
SystemPDFTemplateEntity systemPDFTemplateEntity = systemPDFTemplateService.selectById(String.valueOf(sysPdfTemplateRelevanceLabelEntity.getTemplateId()));
if (null == systemPDFTemplateEntity) {
return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
}
List<SysWorkplaceQueue> sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplace.getWorkplaceId()));
Map<String, Object> data = new HashMap<>(1);
List<Object> list = new ArrayList<>();
int i = 1;
if (sysWorkplaceQueues != null && sysWorkplaceQueues.size() > 0) {
for (SysWorkplaceQueue obj : sysWorkplaceQueues) {
Map<String, Object> supData = new HashMap<>();
supData.put("name", obj.getName() + "");
supData.put("code", obj.getCode());
supData.put("workplaceName", sysWorkplace.getWorkplaceName());
list.add(supData);
i++;
}
}
data.put("data",list);
String param = JSON.toJSONString(data);
JasperUtils.jasperReport(request, response, param, filePath + "pdf/template/" + systemPDFTemplateEntity.getPath(), "pdf");
return ResultVOUtils.error(ResultEnum.DATA_NOT, "模板错误");
}
}

4
src/main/java/com/glxp/api/controller/auth/SysWorkplaceQueueController.java
Unescape Escape View File

@ -73,11 +73,11 @@ public class SysWorkplaceQueueController extends BaseController {
@GetMapping("/udiwms/sysWorkplaceQueue/getByCode")
public BaseResponse getByCode(SysWorkplaceQueueRequest request) {
SysWorkplaceQueue sysWorkplaceQueue =
sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, request.getCode()));
sysWorkplaceQueueService.getOne(new LambdaQueryWrapper<SysWorkplaceQueue>().eq(SysWorkplaceQueue::getCode, request.getCode()).eq(SysWorkplaceQueue::getWorkPlaceIdFk,request.getWorkPlaceIdFk()));
if (sysWorkplaceQueue != null) {
return ResultVOUtils.success(sysWorkplaceQueue);
} else {
return ResultVOUtils.error("货位不存在！");
return ResultVOUtils.error("当前工位未绑定货位！");
}

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

@ -2747,14 +2747,19 @@ public class IoCodeTempController extends BaseController {
List<String> codeList = new ArrayList<>();
collectOrderBizResponses.forEach(item -> {
String code = item.getFinishUdiCode();
if (StrUtil.isNotBlank(code) && code.contains(";")) {
List<String> partsList = Arrays.asList(code.split(";"));
if (code != null && code.length() > 0 && code.charAt(0) == ',') {
code = code.substring(1);
}
if (StrUtil.isNotBlank(code) && code.contains(",")) {
List<String> partsList = Arrays.asList(code.split(","));
codeList.addAll(partsList);
} else {
Integer reCountObj = item.getScanCount();
int reCount = reCountObj != null ? reCountObj : 0; // 如果reCountObj为null，则默认为0次迭代
for (int i = 0; i < reCount; i++) {
codeList.add(code);
if (StrUtil.isNotBlank(code)){
codeList.add(code);
}
}
}

2
src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java
Unescape Escape View File

@ -170,7 +170,7 @@ public class IoOrderDetailBizController extends BaseController {
orderEntity.setDeptCode(invWarehouseEntity.getParentId());
orderEntity.setInvCode(orderEntity.getInvCode());
orderEntity.setBusType(bussinessTypeEntity.getBusType());
orderEntity.setProductType(1);
orderService.insertOrder(orderEntity);
}

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

@ -119,7 +119,7 @@ public class InvProductResponse {
private String serialNo;
private String manufactoryl;
private String manufactory;
/**

2
src/main/java/com/glxp/api/service/basic/UdiProductService.java
Unescape Escape View File

@ -348,6 +348,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
udiRelevanceEntity.setUseMaxLevel(addProductRequest.getUseMaxLevel());
udiRelevanceEntity.setDistributeMaxLevel(addProductRequest.getDistributeMaxLevel());
udiRelevanceEntity.setUpdateTime(new Date());
udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
udiRelevanceDao.updateById(udiRelevanceEntity);
updateLevelCount(udiRelevanceEntity);
@ -366,6 +367,7 @@ public class UdiProductService extends ServiceImpl<UdiProductDao, UdiProductEnti
udiRelevanceEntity.setHcType(addProductRequest.getHcType());
udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
udiRelevanceEntity.setUpdateTime(new Date());
// if (addProductRequest.getDistributeLevelDi() != null) {
// udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());

2
src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
Unescape Escape View File

@ -162,7 +162,9 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
throw new JsonException(500, "当前产品不支持采集该包装层级追溯码！");
}
}
//流通数量
Integer circleCount = calCountUtil.getCirActCount(udiRelevanceResponse);
//使用数量
Integer useCount = calCountUtil.getUseActCount(udiRelevanceResponse);
Integer scanCount = 0;

3
src/main/java/com/glxp/api/service/inv/impl/InvInnerOrderPrintServiceImpl.java
Unescape Escape View File

@ -1,5 +1,6 @@
package com.glxp.api.service.inv.impl;
import com.alibaba.fastjson2.schema.ValidateResult;
import com.glxp.api.service.basic.UdiProductService;
import com.glxp.api.util.udi.UdiCalCountUtil;
import org.springframework.beans.BeanUtils;
@ -123,7 +124,9 @@ public class InvInnerOrderPrintServiceImpl implements InvInnerOrderPrintService
} else {
a = Integer.parseInt(filterUdiRelRequest.getPackLevel()) - 1;
}
UdiProductEntity udiProductEntity1 = udiProductService.selectUdiByName(obj.getNameCode());
// UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(0);
filterUdiRelRequest.setProductsType(udiProductEntity1.getProductsType());
UdiRelevanceResponse filterUdiRelevance = udiRelevanceDao.filterUdiRelevance(filterUdiRelRequest).get(a);
//查询产品信息
UdiProductEntity udiProductEntity = udiProductService.findByNameCode(filterUdiRelevance.getNameCode());

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

@ -1304,7 +1304,7 @@
groupBuy, needCert, isStack,
distributeLevelCount, useLevel,
distributeLevel,
splitEnable, autoCode, distributeMaxLevel, useMaxLevel)
splitEnable, autoCode, distributeMaxLevel, useMaxLevel, unpackUseTime)
values (#{id},
#{uuid},
#{mainId},
@ -1340,7 +1340,7 @@
#{useLevel},
#{distributeLevel},
#{splitEnable},
#{autoCode}, #{distributeMaxLevel}, #{useMaxLevel})
#{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime})
</insert>
<insert id="insertUdiRelevanceignore"

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

@ -33,6 +33,7 @@
bp.prepnUnit,
bp.prepnSpec,
bp.specialCode,
bp.manufactory,
bp.storageCondition,
bp.transportCondition,
bp.indate,

Write Preview
Loading…
Cancel
Save