diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java index 2f2ffa05a..e8b5e9783 100644 --- a/src/main/java/com/glxp/api/controller/auth/LoginController.java +++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java @@ -434,9 +434,9 @@ public class LoginController extends BaseController { @Value("${WEB_SUB_TITLE}") private String WEB_SUB_TITLE; - @Value("${WEB_VERSION}") + @Value("${WEB_VERSION:}") private String WEB_VERSION; - @Value("${WEB_LOGO}") + @Value("${WEB_LOGO:}") private String WEB_LOGO; diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java new file mode 100644 index 000000000..5fd123cad --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -0,0 +1,134 @@ +package com.glxp.api.controller.basic; + +import cn.hutool.core.util.IdUtil; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.github.pagehelper.PageInfo; +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.controller.BaseController; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.entity.system.SysPdfTemplateRelevanceLabelEntity; +import com.glxp.api.entity.system.SystemPDFTemplateEntity; +import com.glxp.api.req.basic.SysWorkplaceFreightRequest; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplaceFreightPrintResponse; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; +import com.glxp.api.service.basic.SysWorkplaceRegionService; +import com.glxp.api.util.JasperUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:04 + * @modyified By : + */ +@Slf4j +@RestController +public class SysWorkplaceRegionController extends BaseController { + + + @Resource + SysWorkplaceRegionService SysWorkplaceRegionService; + + + @GetMapping("/udiwms/sysWorkplaceRegion/getList") + public BaseResponse getUserBindWork(SysWorkplaceRegionRequest request) { + List regionResponses = SysWorkplaceRegionService.filterList(request); + PageInfo pageInfo = new PageInfo<>(regionResponses); + PageSimpleResponse pageSimpleResponse = new PageSimpleResponse<>(); + pageSimpleResponse.setTotal(pageInfo.getTotal()); + pageSimpleResponse.setList(regionResponses); + return ResultVOUtils.success(pageSimpleResponse); + } + + @PostMapping("/udiwms/sysWorkplaceRegion/addRegion") + public BaseResponse addRegion(@RequestBody SysWorkplaceRegion sysWorkplaceRegion) { + SysWorkplaceRegion one = SysWorkplaceRegionService.isExist(sysWorkplaceRegion); + if (one != null){ + return ResultVOUtils.error(500,"区域名称已存在或区域编码重复"); + } + sysWorkplaceRegion.setId(IdUtil.getSnowflakeNextId()); + sysWorkplaceRegion.setCreateTime(new Date()); + sysWorkplaceRegion.setUpdateTime(new Date()); + sysWorkplaceRegion.setCreateUser(getUserId() + ""); + sysWorkplaceRegion.setUpdateUser(getUserId() + ""); + SysWorkplaceRegionService.save(sysWorkplaceRegion); + return ResultVOUtils.success(); + } + + + @PostMapping("/udiwms/sysWorkplaceRegion/editRegion") + public BaseResponse editRegion(@RequestBody SysWorkplaceRegionRequest request) { + SysWorkplaceRegion one = SysWorkplaceRegionService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceRegion::getRegionName,request.getRegionName())); + if (one != null){ + return ResultVOUtils.error(500,"区域名称重复"); + } + SysWorkplaceRegion sysWorkplaceRegion = new SysWorkplaceRegion(); + sysWorkplaceRegion.setRegionName(request.getRegionName()); + sysWorkplaceRegion.setId(request.getId()); + sysWorkplaceRegion.setUpdateTime(new Date()); + sysWorkplaceRegion.setUpdateUser(getUserId() + ""); + SysWorkplaceRegionService.updateById(sysWorkplaceRegion); + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/sysWorkplaceRegion/delRegion") + public BaseResponse editRegion(@RequestBody SysWorkplaceRegion sysWorkplaceRegion) { + SysWorkplaceRegionService.removeById(sysWorkplaceRegion); + return ResultVOUtils.success(); + } + + + + @PostMapping("/udiwms/WorkplaceFreight/printRegion") + public BaseResponse printFreight(@RequestBody SysWorkplaceRegionRequest sysWorkplaceRegionRequest, HttpServletRequest request, HttpServletResponse response) throws Exception { +// SysPdfTemplateRelevanceLabelEntity sysPdfTemplateRelevanceLabelEntity = systemPDFModuleService.selectByLabelId(sysWorkplaceFreightRequest.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 sysWorkplaceQueues = sysWorkplaceQueueService.list(new LambdaQueryWrapper().eq(SysWorkplaceQueue::getWorkPlaceIdFk, sysWorkplaceFreightRequest.getWorkplaceId())); +// List responses = sysWorkplaceFreightService.getList(sysWorkplaceFreightRequest); +// +// Map data = new HashMap<>(1); +// List list = new ArrayList<>(); +// int i = 1; +// if (responses != null && responses.size() > 0) { +// for (SysWorkplaceFreightPrintResponse obj : responses) { +// if (obj.getQueueCode() != null && obj.getQueueCode()!= ""){ +// Map supData = new HashMap<>(); +// supData.put("name", obj.getRemark() + ""); +// supData.put("code", obj.getQueueCode()); +// supData.put("workplaceName", obj.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, "模板错误"); + } + + + +} diff --git a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java index c71d56f53..fdd4f7271 100644 --- a/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java +++ b/src/main/java/com/glxp/api/controller/purchase/IoPurChangeService.java @@ -131,6 +131,7 @@ public class IoPurChangeService { purPlanEntity.setApplyBillNo(purApplyEntity.getBillNo()); purPlanEntity.setApplyRemark(purApplyEntity.getRemark()); purPlanEntity.setPageType(purApplyEntity.getPageType()); + purPlanEntity.setProductType(purApplyEntity.getProductType()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { purPlanEntity.setCreateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); purPlanEntity.setUpdateTime(MsDateUtil.timeProcess(purApplyEntity.getCreateTime(), basicBusTypeChangeEntity.getBusBeforeTime())); @@ -240,6 +241,7 @@ public class IoPurChangeService { purOrderEntity.setBillType(ConstantStatus.BUS_ORDER_CGDD); purOrderEntity.setPurPlanId(purPlanEntity.getBillNo()); purOrderEntity.setPageType(purPlanEntity.getPageType()); + purOrderEntity.setProductType(purPlanEntity.getProductType()); if (basicBusTypeChangeEntity.getBusBeforeTime() != null) { purOrderEntity.setCreateTime(MsDateUtil.timeProcess(new Date(), basicBusTypeChangeEntity.getBusBeforeTime())); purOrderEntity.setUpdateTime(new Date()); diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java index 1fa99afa2..275db722d 100644 --- a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceFreightMapper.java @@ -17,4 +17,6 @@ public interface SysWorkplaceFreightMapper extends BaseMapper filterList(SysWorkplaceFreightRequest request); List getList(SysWorkplaceFreightRequest sysWorkplaceFreightRequest); + + SysWorkplaceFreight selectMaxCode(); } diff --git a/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java new file mode 100644 index 000000000..7e0e2385f --- /dev/null +++ b/src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java @@ -0,0 +1,19 @@ +package com.glxp.api.dao.basic; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; + +import java.util.List; + +/** + * @author : zhangsan + * @date : 2025/2/18 11:02 + * @modyified By : + */ + +public interface SysWorkplaceRegionMapper extends BaseMapper { + + List filterList(SysWorkplaceRegionRequest request); +} diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java index cda9d23e0..0f011c5a4 100644 --- a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceLayer.java @@ -27,6 +27,14 @@ public class SysWorkplaceLayer implements Serializable { @ApiModelProperty(value = "货位编码") private String code; + + /** + * 摆货层名称 + */ + @TableField(value = "name") + @ApiModelProperty(value = "") + private String name; + /** * 备注 */ diff --git a/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java new file mode 100644 index 000000000..7bf66655e --- /dev/null +++ b/src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java @@ -0,0 +1,70 @@ +package com.glxp.api.entity.basic; + +import java.io.Serializable; +import java.util.Date; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +@ApiModel(description = "sys_workplace_region") +@Data +@TableName(value = "sys_workplace_region") +public class SysWorkplaceRegion implements Serializable { + /** + * + */ + @TableId(value = "id", type = IdType.INPUT) + @ApiModelProperty(value = "") + private Long id; + + /** + * 区域编号 + */ + @TableField(value = "regionCode") + @ApiModelProperty(value = "区域编号") + private Integer regionCode; + + /** + * 区域名称 + */ + @TableField(value = "regionName") + @ApiModelProperty(value = "区域名称") + private String regionName; + + /** + * + */ + @TableField(value = "updateTime") + @ApiModelProperty(value = "") + private Date updateTime; + + /** + * + */ + @TableField(value = "createTime") + @ApiModelProperty(value = "") + private Date createTime; + + /** + * + */ + @TableField(value = "updateUser") + @ApiModelProperty(value = "") + private String updateUser; + + /** + * + */ + @TableField(value = "createUser") + @ApiModelProperty(value = "") + private String createUser; + + private static final long serialVersionUID = 1L; +} + diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java index 389f50e0b..5b4894fa9 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceLayerRequest.java @@ -50,6 +50,8 @@ public class SysWorkplaceLayerRequest extends ListPageRequest { private String name; + private String layerName; + diff --git a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java new file mode 100644 index 000000000..fe695c1d2 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -0,0 +1,26 @@ +package com.glxp.api.req.basic; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.glxp.api.util.page.ListPageRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:08 + * @modyified By : + */ + +@Data +public class SysWorkplaceRegionRequest extends ListPageRequest { + + + private Integer regionCode; + + + private String regionName; + + private Long id; + + private String LabelId; +} diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java index 29c8465a0..550bb8b43 100644 --- a/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceLayerResponse.java @@ -76,5 +76,7 @@ public class SysWorkplaceLayerResponse { @ApiModelProperty(value = "") private Integer height; + private String name; + private List sysWorkplaceQueues; } diff --git a/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java new file mode 100644 index 000000000..d5aeef8ae --- /dev/null +++ b/src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java @@ -0,0 +1,41 @@ +package com.glxp.api.res.basic; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.Date; + +/** + * @author : zhuzhu + * @date : 2025/2/18 11:09 + * @modyified By : + */ + +@Data +public class SysWorkplaceRegionResponse { + + + private Long id; + + /** + * 区域编号 + */ + private Integer regionCode; + + /** + * 区域名称 + */ + private String regionName; + + + private Date updateTime; + + private Date createTime; + + private String updateUser; + + private String createUser; +} diff --git a/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java index 7ef0c94a3..161ece164 100644 --- a/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java +++ b/src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java @@ -97,4 +97,5 @@ public class PurApplyResponse { private Integer pageType; + private Integer productType; } diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java index 3c83f7309..6e0ae62da 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -72,17 +72,17 @@ public class SysWorkplaceFreightService extends ServiceImpl().orderByDesc(SysWorkplaceFreight::getCode).last("LIMIT 1")); + SysWorkplaceFreight sysWorkplaceQueue = sysWorkplaceFreightMapper.selectMaxCode(); if (sysWorkplaceQueue == null){ //没有数据 新增 code = "DMQ00" + 1; }else { String code1 = sysWorkplaceQueue.getCode(); - String withoutDMQ = code1.replace("DMQ", ""); + String withoutDMQ = code1.replace("DMQ00", ""); Integer result = Integer.parseInt(withoutDMQ.trim()); result += 1; - String sixDigitResult = String.format("%03d", result); - code = "DMQ" + sixDigitResult; +// String sixDigitResult = String.format("%03d", result); + code = "DMQ00" + result; } return code; } diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java index 87a1b4f71..21db7f560 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceLayerService.java @@ -1,5 +1,6 @@ package com.glxp.api.service.basic; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; @@ -100,6 +101,9 @@ public class SysWorkplaceLayerService extends ServiceImpl { + + + @Resource + SysWorkplaceRegionMapper sysWorkplaceRegionMapper; + + + public List filterList(SysWorkplaceRegionRequest request) { + if (null == request) { + return Collections.emptyList(); + } + if (null != request.getPage() && null != request.getLimit()) { + PageHelper.offsetPage((request.getPage() - 1) * request.getLimit(), request.getLimit()); + } + return super.baseMapper.filterList(request); + } + + public SysWorkplaceRegion isExist(SysWorkplaceRegion sysWorkplaceRegion) { + return getOne(new LambdaQueryWrapper() + .eq(SysWorkplaceRegion::getRegionCode, sysWorkplaceRegion.getRegionCode()) + .or() + .eq(SysWorkplaceRegion::getRegionName, sysWorkplaceRegion.getRegionName())); + } +} diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java index d4700239d..863bce120 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -1,6 +1,7 @@ package com.glxp.api.service.collect; import cn.hutool.core.thread.ThreadUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.TypeReference; @@ -8,6 +9,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.common.res.BaseResponse; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.dao.collect.IoCollectLedGroupMapper; import com.glxp.api.entity.basic.SysWorkplaceQueue; import com.glxp.api.entity.collect.IoCollectLedGroup; @@ -15,10 +17,12 @@ import com.glxp.api.entity.collect.IoCollectOrder; import com.glxp.api.entity.collect.IoCollectOrderBiz; import com.glxp.api.entity.collect.SysOrderLed; import com.glxp.api.entity.thrsys.CodeRel; +import com.glxp.api.entity.thrsys.ThrManufacturerEntity; import com.glxp.api.enums.led.LedColorStatusEnum; import com.glxp.api.exception.JsonException; import com.glxp.api.req.collect.CollectLedGroupRequest; import com.glxp.api.req.collect.LedGroupRequest; +import com.glxp.api.res.PageSimpleResponse; import com.glxp.api.res.collect.IoCollectLedGroupResponse; import com.glxp.api.service.basic.SysWorkplaceQueueService; import com.glxp.api.util.IntUtil; @@ -73,6 +77,7 @@ public class IoCollectLedGroupService extends ServiceImpl openLed(List collectOrderBizs) { + log.error("获取灯组=============="); LedGroupRequest ledGroupRequest = new LedGroupRequest(); for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) { @@ -113,11 +118,17 @@ public class IoCollectLedGroupService extends ServiceImpl response = - JSONObject.parseObject(result, new TypeReference>() { - }); - return response; + try { + String result = okHttpCli.doPostJson("http://192.168.0.166:9099/wms/associate/lighttagsled", json); + BaseResponse response = + JSONObject.parseObject(result, new TypeReference>() { + }); + return response; + } catch (Exception e) { + log.error("灯组获取异常", e); + return ResultVOUtils.error(500, "连接灯组异常！"); + } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java index cda8dae2d..09c4912f8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -5,6 +5,8 @@ import cn.hutool.core.thread.ThreadUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.glxp.api.annotation.Log; +import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.constant.Constant; import com.glxp.api.constant.ConstantStatus; import com.glxp.api.constant.ConstantType; @@ -35,6 +37,7 @@ import com.glxp.api.util.IntUtil; import com.glxp.api.util.OrderNoTypeBean; import com.glxp.api.util.udi.FilterUdiUtils; import com.glxp.api.util.udi.UdiCalCountUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; @@ -54,6 +57,7 @@ import static com.glxp.api.constant.ConstantStatus.ORDER_STATUS_CHECK_PROCESS; */ @Service @Transactional(rollbackFor = Exception.class) +@Slf4j public class IoCheckInoutService { @Resource @@ -138,13 +142,19 @@ public class IoCheckInoutService { public void check(String orderId) { IoOrderEntity orderEntity = orderService.findByBillNo(orderId); //过滤非未校验或校验异常 + log.error("修改订单当前状态 带校验"); if (orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_PROCESS && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK && orderEntity.getStatus() != ConstantStatus.ORDER_STATUS_CHECK_FAIL) return; - orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS); - orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); - orderService.update(orderEntity); - + try { + orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS); + orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); + int update = orderService.update(orderEntity); + log.error("修改订单结果========:::::::" + update); + } catch (Exception e) { + e.printStackTrace(); + } + log.error("修改订单"); BasicBussinessTypeEntity bussinessTypeEntity = basicBussinessTypeService.findByAction(orderEntity.getAction()); if (!bussinessTypeEntity.isCheckEnable()) { unCheckFirstFinish(orderEntity); @@ -529,7 +539,7 @@ public class IoCheckInoutService { * @param orderEntity */ public void unCheckFirstFinish(IoOrderEntity orderEntity) { - + log.error("进入了 一次校验（无需校验）完成"); List orderDetailCodeEntities = orderDetailCodeService.findByOrderId(orderEntity.getBillNo()); if (CollUtil.isEmpty(orderDetailCodeEntities)) { @@ -543,8 +553,10 @@ public class IoCheckInoutService { if (orderEntity.getFromType() != ConstantStatus.FROM_UDISP) { if (orderEntity.getFromType() != ConstantStatus.FROM_COPY && orderEntity.getFromType() != ConstantStatus.FROM_CHANGE) { + log.error("进入了 一次校验（无需校验）完成 2"); orderDetailBizService.deleteByOrderId(orderEntity.getBillNo()); } + log.error("进入了 一次校验（无需校验）完成 3"); orderDetailResultService.deleteByOrderId(orderEntity.getBillNo()); if (!orderDetailBizService.isExit(orderEntity.getBillNo())) { orderDetailCodeEntities.forEach(orderDetailCodeEntity -> @@ -557,6 +569,7 @@ public class IoCheckInoutService { orderDetailBizService.insert(orderDetailBizEntity); }); + log.error("进入了 一次校验（无需校验）完成 4"); } orderDetailCodeEntities.forEach(orderDetailCodeEntity -> { @@ -574,10 +587,12 @@ public class IoCheckInoutService { orderDetailResultService.insert(orderDetailResultEntity); }); + log.error("进入了 一次校验（无需校验）完成 5"); } //临时表转正式表 List codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo()); + log.error("进入了 一次校验（无需校验）完成 6"); for (IoCodeTempEntity codeTempEntity : codeTempEntities) { IoCodeEntity codeEnttity = new IoCodeEntity(); BeanUtils.copyProperties(codeTempEntity, codeEnttity); @@ -593,6 +608,7 @@ public class IoCheckInoutService { codeEnttity.setId(null); codeService.insert(codeEnttity); } + log.error("进入了 一次校验（无需校验）完成 7"); codeTempService.deleteByBillNo(orderEntity.getBillNo()); orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS); orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST); diff --git a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java index 233d17c97..eb99e7414 100644 --- a/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java +++ b/src/main/java/com/glxp/api/service/inout/IoSplitFifoInvService.java @@ -26,6 +26,7 @@ import com.glxp.api.service.collect.IoSplitFifoInvRelService; import com.glxp.api.service.thrsys.SysWorkplacePutRelService; import com.glxp.api.util.IntUtil; import org.apache.xpath.operations.Bool; +import org.aspectj.weaver.ast.Var; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; @@ -159,17 +160,19 @@ public class IoSplitFifoInvService extends ServiceImpl filteredQueues = queues.stream().filter(queue -> { - IoSplitFifoInv one = getOne(new LambdaQueryWrapper().eq(IoSplitFifoInv::getWorkPlaceQueueCode, queue.getCode())); - return one == null; // 只保留那些没有匹配的槽位 - }).sorted((queue1, queue2) -> queue1.getCode().compareTo(queue2.getCode())).collect(Collectors.toList()); - if (filteredQueues.size() > 0) { - //还有剩余的槽位 可分配 - SysWorkplaceQueue sysWorkplaceQueue = filteredQueues.get(0); - return sysWorkplaceQueue.getCode(); - } else { +// // 使用流来过滤掉匹配的元素 +// List filteredQueues = queues.stream() +// .filter(queue -> { +// IoSplitFifoInv one = getOne( +// new LambdaQueryWrapper() +// .eq(IoSplitFifoInv::getWorkPlaceQueueCode, queue.getCode()) +// ); +// return one == null; // 只保留那些没有匹配的槽位 +// }) +// .sorted((queue1, queue2) -> queue1.getCode().compareTo(queue2.getCode())) +// .collect(Collectors.toList()); //增加一个槽位 SysWorkplaceLayer layer = sysWorkplaceLayerService.getOne(new LambdaQueryWrapper().eq(SysWorkplaceLayer::getCode, workplaceQueue.getLayerCode())); SysWorkplaceLayerRequest sysWorkplaceLayerRequest = new SysWorkplaceLayerRequest(); @@ -178,8 +181,8 @@ public class IoSplitFifoInvService extends ServiceImpl order by swf.code,swl.code, swq.code + diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml index 343492d80..540fb89c5 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceQueueMapper.xml @@ -171,7 +171,7 @@ diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceRegionMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceRegionMapper.xml new file mode 100644 index 000000000..8f68d9c43 --- /dev/null +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceRegionMapper.xml @@ -0,0 +1,16 @@ + + + + + diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index fd42be5f1..9f2936cd4 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -675,22 +675,25 @@ AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') + thirdId3 ]]> '' or thirdId4 ]]> '') and basic_products.originUuid ]]> '' - AND (thirdId ]]> '' or thirdId1 ]]> '' or thirdId2 ]]> '' or - thirdId3 ]]> '' or thirdId4 ]]> '') - and mainId ]]> '' + AND (thirdId is not null or thirdId1 is not null) + + + AND basic_products.nameCode is not null AND basic_products.originUuid is NULL - AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null) - or (thirdId2 = '' or thirdId2 is null) or (thirdId3 = '' or thirdId3 is null) - or (thirdId4 = '' or thirdId4 is null)) - AND (mainId = '' or mainId is null) + AND ((thirdId = '' or thirdId is null) or (thirdId1 = '' or thirdId1 is null) + ) + + + AND ( (mainId = '' or mainId is null) or (basic_products.nameCode = '' or basic_products.nameCode is null) + ) AND (mainId is NULL or mainId = '') diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 82d5fbb10..5a86c4761 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5236,6 +5236,37 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'ipcMaxCount', 'int NULL DEFAULT NULL COMMENT ''PDA扫码数量''', 1); +CALL Pro_Temp_ColumnWork('io_collect_set', 'fixedCount', + 'int NULL DEFAULT NULL COMMENT ''高拍仪扫码数量''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_set', 'autoDecode', + 'tinyint NULL DEFAULT NULL COMMENT ''高拍仪是否自动解码 1:自动 0:手动''', + 1); + +CALL Pro_Temp_ColumnWork('io_collect_set', 'outputMode', + 'tinyint NULL DEFAULT NULL COMMENT ''高拍仪输出顺序 0：不排序，1：从左到右，2：从右到左，3：从上到下，4：从下到上。''', + 1); + +CREATE TABLE IF NOT EXISTS `sys_workplace_region` +( + `id` bigint NOT NULL, + `regionCode` int NULL DEFAULT NULL COMMENT '区域编号', + `regionName` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '区域名称', + `updateTime` datetime NULL DEFAULT NULL, + `createTime` datetime NULL DEFAULT NULL, + `updateUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 8052 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + COMMENT = '槽位区域表' + ROW_FORMAT = Dynamic; + +ALTER TABLE rel_code_batch + MODIFY COLUMN `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '批次号'; CREATE TABLE IF NOT EXISTS `inv_product_batch` ( `id` int NOT NULL AUTO_INCREMENT,