From 9e77c204cb9d11f6b2ec08d0a20287a6f5fcd05c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Feb 2025 11:44:04 +0800 Subject: [PATCH 01/14] =?UTF-8?q?2/11=20=E5=8F=96=E8=B4=A7=E6=9E=B6=20?= =?UTF-8?q?=E6=A7=BD=E4=BD=8D=E7=BC=96=E5=8F=B7bug=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/basic/SysWorkplaceFreightMapper.java | 2 ++ .../basic/SysWorkplaceFreightService.java | 2 +- .../basic/SysWorkplaceFreightMapper.xml | 6 ++++++ .../mapper/basic/SysWorkplaceQueueMapper.xml | 4 ++-- .../mybatis/mapper/basic/UdiRelevanceDao.xml | 19 +++++++++++-------- 5 files changed, 22 insertions(+), 11 deletions(-) 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/service/basic/SysWorkplaceFreightService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java index 3c83f7309..1a3ccfbd6 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -72,7 +72,7 @@ public class SysWorkplaceFreightService extends ServiceImpl().orderByDesc(SysWorkplaceFreight::getCode).last("LIMIT 1")); + SysWorkplaceFreight sysWorkplaceQueue = sysWorkplaceFreightMapper.selectMaxCode(); if (sysWorkplaceQueue == null){ //没有数据 新增 code = "DMQ00" + 1; diff --git a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml index 7b408d612..55a1864ea 100644 --- a/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml +++ b/src/main/resources/mybatis/mapper/basic/SysWorkplaceFreightMapper.xml @@ -66,4 +66,10 @@ 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 215fbca26..dc7fd247a 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/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 = '') From e300ddde9f8e1173b87bdf0528b859146845e5a3 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Feb 2025 14:08:54 +0800 Subject: [PATCH 02/14] =?UTF-8?q?2/11=20=E5=8F=96=E8=B4=A7=E6=9E=B6?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=20bug=20=E4=BC=98=E5=8C=961.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/service/basic/SysWorkplaceFreightService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 1a3ccfbd6..6e0ae62da 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceFreightService.java @@ -78,11 +78,11 @@ public class SysWorkplaceFreightService extends ServiceImpl Date: Tue, 11 Feb 2025 17:46:07 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E8=8D=AF=E5=93=81/=E5=99=A8=E6=A2=B0=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=B3=E8=B4=AD=E5=8D=95=20=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E5=92=8C=E8=AE=A2=E5=8D=95=E7=AE=A1=E7=90=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=B1=BB=E5=9E=8B=E4=B8=8D=E5=AF=B9=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/controller/purchase/IoPurChangeService.java | 2 ++ src/main/java/com/glxp/api/res/purchase/PurApplyResponse.java | 1 + 2 files changed, 3 insertions(+) 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 a0d4f4b78..21a48fb43 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/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; } From b01c74826d7e244a84e3f1deef759e80f82359c7 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 11 Feb 2025 18:29:44 +0800 Subject: [PATCH 04/14] =?UTF-8?q?2/11=20=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/auth/LoginController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 03fe98040..b5136b7a9 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; From d6e1b6d17167e8e1d51c8cd89a2f608585a7883b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Wed, 12 Feb 2025 19:07:32 +0800 Subject: [PATCH 05/14] =?UTF-8?q?2/11=20=E6=B5=8B=E8=AF=951.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/service/inout/IoCheckInoutService.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) 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..9b36263a6 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); From 3cd95efced2ed97fa8bfc4e28e73d574cbf929eb Mon Sep 17 00:00:00 2001 From: chenhc <2369838784@qq.com> Date: Wed, 12 Feb 2025 19:42:10 +0800 Subject: [PATCH 06/14] =?UTF-8?q?feat:=20=E6=89=93=E5=8D=B0=E6=97=A5?= =?UTF-8?q?=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/service/inout/IoCheckInoutService.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) 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 9b36263a6..09c4912f8 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java @@ -539,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)) { @@ -553,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 -> @@ -567,6 +569,7 @@ public class IoCheckInoutService { orderDetailBizService.insert(orderDetailBizEntity); }); + log.error("进入了 一次校验（无需校验）完成 4"); } orderDetailCodeEntities.forEach(orderDetailCodeEntity -> { @@ -584,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); @@ -603,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); From edea7945a0c5aa07afe9935a59b6b267a8ec278b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 13 Feb 2025 10:14:02 +0800 Subject: [PATCH 07/14] =?UTF-8?q?2/13=20=E8=BF=9E=E6=8E=A5=E7=81=AF?= =?UTF-8?q?=E7=BB=841.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/IoCollectLedGroupService.java | 21 ++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) 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 eb91d0e4a..52bd45ed8 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, "连接灯组异常！"); + } + } From 3ec2a73b915154848652dd18e2d0e8b1f7487788 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 13 Feb 2025 11:20:12 +0800 Subject: [PATCH 08/14] =?UTF-8?q?2/13=20=E8=99=9A=E6=8B=9F=E6=A7=BD?= =?UTF-8?q?=E4=BD=8Dbug=E4=BC=98=E5=8C=961.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceQueueService.java | 4 +++ .../service/inout/IoSplitFifoInvService.java | 34 +++++++++---------- 2 files changed, 20 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java index 69e8794ac..b82a089e9 100644 --- a/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceQueueService.java @@ -254,5 +254,9 @@ public class SysWorkplaceQueueService 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(); @@ -206,8 +204,8 @@ public class IoSplitFifoInvService extends ServiceImpl Date: Fri, 14 Feb 2025 18:24:16 +0800 Subject: [PATCH 09/14] =?UTF-8?q?2/14=20=E9=AB=98=E6=8B=8D=E4=BB=AA?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/glxp/api/entity/collect/IoCollectSet.java | 13 +++++++++++++ src/main/resources/schemas/schema_v2.4.sql | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java index c1aa604d1..1b99312ba 100644 --- a/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java +++ b/src/main/java/com/glxp/api/entity/collect/IoCollectSet.java @@ -108,5 +108,18 @@ public class IoCollectSet implements Serializable { @ApiModelProperty(value = "工控扫码数量") private Integer ipcMaxCount; + @TableField(value = "fixedCount") + @ApiModelProperty(value = "高拍仪扫码数量") + private Integer fixedCount; + + @TableField(value = "autoDecode") + @ApiModelProperty(value = "高拍仪是否自动解码 1:自动 0:手动") + private Integer autoDecode; + + @TableField(value = "outputMode") + @ApiModelProperty(value = "高拍仪输出顺序 0：不排序，1：从左到右，2：从右到左，3：从上到下，4：从下到上。") + private Integer outputMode; + + private static final long serialVersionUID = 1L; } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 0f4382501..8151823cd 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5232,3 +5232,16 @@ 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); + + From 74eb299633663cd1e7ed7afb6d9049c0dda15991 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Feb 2025 14:17:22 +0800 Subject: [PATCH 10/14] =?UTF-8?q?2/18=20=E6=A7=BD=E4=BD=8D=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A1=A8=20--=E5=8F=96=E8=B4=A7=E6=9E=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=89=93=E5=8D=B0=E6=9C=AA=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceRegionController.java | 42 +++++++++++++++++++ .../dao/basic/SysWorkplaceRegionMapper.java | 19 +++++++++ .../req/basic/SysWorkplaceRegionRequest.java | 21 ++++++++++ .../res/basic/SysWorkplaceRegionResponse.java | 41 ++++++++++++++++++ .../basic/SysWorkplaceRegionService.java | 32 ++++++++++++++ .../collect/IoCollectLedGroupService.java | 2 +- .../mapper/basic/SysWorkplaceRegionMapper.xml | 16 +++++++ src/main/resources/schemas/schema_v2.4.sql | 25 ++++++++--- 8 files changed, 192 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java create mode 100644 src/main/java/com/glxp/api/dao/basic/SysWorkplaceRegionMapper.java create mode 100644 src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java create mode 100644 src/main/java/com/glxp/api/res/basic/SysWorkplaceRegionResponse.java create mode 100644 src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java create mode 100644 src/main/resources/mybatis/mapper/basic/SysWorkplaceRegionMapper.xml 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..0d18e2c86 --- /dev/null +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -0,0 +1,42 @@ +package com.glxp.api.controller.basic; + +import com.github.pagehelper.PageInfo; +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.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.PageSimpleResponse; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; +import com.glxp.api.service.basic.SysWorkplaceRegionService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @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); + } +} 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/req/basic/SysWorkplaceRegionRequest.java b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java new file mode 100644 index 000000000..358ad0e66 --- /dev/null +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -0,0 +1,21 @@ +package com.glxp.api.req.basic; + +import com.glxp.api.util.page.ListPageRequest; +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; + +} 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/service/basic/SysWorkplaceRegionService.java b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java new file mode 100644 index 000000000..7e6c449ce --- /dev/null +++ b/src/main/java/com/glxp/api/service/basic/SysWorkplaceRegionService.java @@ -0,0 +1,32 @@ +package com.glxp.api.service.basic; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.PageHelper; +import com.glxp.api.dao.basic.SysWorkplaceRegionMapper; +import com.glxp.api.entity.basic.SysWorkplaceRegion; +import com.glxp.api.req.basic.SysWorkplaceRegionRequest; +import com.glxp.api.res.basic.SysWorkplaceRegionResponse; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.Collections; +import java.util.List; + +@Service +public class SysWorkplaceRegionService 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); + } +} 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 52bd45ed8..863bce120 100644 --- a/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java +++ b/src/main/java/com/glxp/api/service/collect/IoCollectLedGroupService.java @@ -168,7 +168,7 @@ public class IoCollectLedGroupService extends ServiceImpl + + + + diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 8151823cd..63a215d60 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5159,8 +5159,6 @@ CALL Pro_Temp_ColumnWork('sys_workplace_freight', 'freightRow', - - CALL Pro_Temp_ColumnWork('io_split_fifo_inv', 'inCodeCount', 'int NULL DEFAULT NULL COMMENT ''入库码数量''', 1); @@ -5192,11 +5190,11 @@ VALUES (463279, 213, '2', 1, 'macBind', '灯组是否绑定', 'select', NULL, NU -CREATE TABLE IF NOT EXISTS `sys_order_led` +CREATE TABLE IF NOT EXISTS `sys_order_led` ( `id` int NOT NULL, `ledNum` tinyint NULL DEFAULT NULL COMMENT '1.红，2：橙，3：蓝，4：绿', - `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', + `orderId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '订单编号', `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL, `updateTime` datetime NULL DEFAULT NULL, `createTime` datetime NULL DEFAULT NULL, @@ -5218,7 +5216,7 @@ CALL Pro_Temp_ColumnWork('io_collect_code_backup', 'relCodeCount', ' int DEFAULT ''0'' COMMENT ''关联关系数量''', 1); INSERT IGNORE INTO sys_scheduled(`id`, `cronName`, `cron`, `customerId`, `remark`) -VALUES (510,'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); +VALUES (510, 'collectOrderEelCodeCountTask', '0 0 */8 * * *', NULL, '定时拉取关联关系数量到上传医保码表'); CALL Pro_Temp_ColumnWork('io_collect_set', 'scanMaxCount', 'int NULL DEFAULT NULL COMMENT ''扫码数量''', @@ -5245,3 +5243,20 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'outputMode', 1); +DROP TABLE IF EXISTS `sys_workplace_region`; +CREATE TABLE `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; From aec85623d65d2d859209625d01acb00cf26072e5 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Tue, 18 Feb 2025 14:24:10 +0800 Subject: [PATCH 11/14] =?UTF-8?q?2/18=20=E6=A7=BD=E4=BD=8D=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E8=A1=A8=20--=E5=8F=96=E8=B4=A7=E6=9E=B6=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=89=93=E5=8D=B0=E6=9C=AA=E5=AE=8C=E6=88=901.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.4.sql | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 63a215d60..87e147290 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5242,9 +5242,7 @@ CALL Pro_Temp_ColumnWork('io_collect_set', 'outputMode', 'tinyint NULL DEFAULT NULL COMMENT ''高拍仪输出顺序 0：不排序，1：从左到右，2：从右到左，3：从上到下，4：从下到上。''', 1); - -DROP TABLE IF EXISTS `sys_workplace_region`; -CREATE TABLE `sys_workplace_region` +CREATE TABLE IF NOT EXISTS `sys_workplace_region` ( `id` bigint NOT NULL, `regionCode` int NULL DEFAULT NULL COMMENT '区域编号', From fd2d2575c4f9b8037fcddceb54be3f9b3a9eb46a Mon Sep 17 00:00:00 2001 From: qiuyt Date: Thu, 20 Feb 2025 09:51:43 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB=E6=89=B9=E6=AC=A1=E5=8F=B7?= =?UTF-8?q?=E5=A4=AA=E9=95=BF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/schemas/schema_v2.4.sql | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 87e147290..6f9b9a106 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -5258,3 +5258,6 @@ CREATE TABLE IF NOT EXISTS `sys_workplace_region` 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 '批次号'; From c514bd02e00d81f6c6cb666e255b8340b78d7b59 Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Feb 2025 10:56:58 +0800 Subject: [PATCH 13/14] =?UTF-8?q?2/20=20=E4=BB=A3=E7=A0=81=E5=A4=87?= =?UTF-8?q?=E4=BB=BD1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/basic/SysWorkplaceRegionController.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java index 0d18e2c86..8147523da 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -11,6 +11,8 @@ import com.glxp.api.res.basic.SysWorkplaceRegionResponse; import com.glxp.api.service.basic.SysWorkplaceRegionService; 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; @@ -39,4 +41,10 @@ public class SysWorkplaceRegionController extends BaseController { pageSimpleResponse.setList(regionResponses); return ResultVOUtils.success(pageSimpleResponse); } + + @PostMapping("/udiwms/sysWorkplaceRegion/addRegion") + public BaseResponse addRegion(@RequestBody SysWorkplaceRegion sysWorkplaceRegion) { + + return ResultVOUtils.success(); + } } From 234177ec75d8cf207926c4da9c4ee28f47f2aa8b Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Thu, 20 Feb 2025 16:54:16 +0800 Subject: [PATCH 14/14] =?UTF-8?q?2/20=20=E4=BC=98=E5=8C=961.0=20=20?= =?UTF-8?q?=E6=A7=BD=E4=BD=8D=E5=8C=BA=E5=9F=9F=E6=89=93=E5=8D=B0=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/SysWorkplaceRegionController.java | 86 ++++++++++++++++++- .../api/entity/basic/SysWorkplaceLayer.java | 8 ++ .../api/entity/basic/SysWorkplaceRegion.java | 70 +++++++++++++++ .../req/basic/SysWorkplaceLayerRequest.java | 2 + .../req/basic/SysWorkplaceRegionRequest.java | 5 ++ .../res/basic/SysWorkplaceLayerResponse.java | 2 + .../basic/SysWorkplaceLayerService.java | 7 ++ .../basic/SysWorkplaceRegionService.java | 8 ++ 8 files changed, 187 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/glxp/api/entity/basic/SysWorkplaceRegion.java diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java index 8147523da..5fd123cad 100644 --- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java +++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceRegionController.java @@ -1,14 +1,23 @@ 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; @@ -16,7 +25,9 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.util.*; /** * @author : zhuzhu @@ -44,7 +55,80 @@ public class SysWorkplaceRegionController extends BaseController { @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/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 index 358ad0e66..fe695c1d2 100644 --- a/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java +++ b/src/main/java/com/glxp/api/req/basic/SysWorkplaceRegionRequest.java @@ -1,6 +1,8 @@ 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; /** @@ -18,4 +20,7 @@ public class SysWorkplaceRegionRequest extends ListPageRequest { 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/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() + .eq(SysWorkplaceRegion::getRegionCode, sysWorkplaceRegion.getRegionCode()) + .or() + .eq(SysWorkplaceRegion::getRegionName, sysWorkplaceRegion.getRegionName())); + } }