From 787e9f220cb0f64e98d62acb62ba010abf15111c Mon Sep 17 00:00:00 2001 From: wangwei <1610949092@qq.com> Date: Sat, 14 Sep 2024 14:26:42 +0800 Subject: [PATCH] =?UTF-8?q?9/14=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/SysWorkplaceController.java | 4 +-- .../api/req/collect/CollectOrderRequest.java | 1 + .../res/collect/IoCollectOrderResponse.java | 5 ++++ .../api/service/auth/SysWorkplaceService.java | 28 +++++++++++++++++++ .../mapper/collect/IoCollectOrderMapper.xml | 2 ++ .../collect/IoCollectOrderOriginMapper.xml | 5 ++-- 6 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java index f5da040d9..f5d24a82f 100644 --- a/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java +++ b/src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java @@ -137,8 +137,8 @@ public class SysWorkplaceController extends BaseController { @PostMapping("/udiwms/sysWorkplace/updateWorkplace") public BaseResponse updateWorkplace(@RequestBody SysWorkplace sysWorkplace) { - sysWorkplace.setUpdateTime(new Date()); - boolean save = sysWorkplaceService.updateById(sysWorkplace); + sysWorkplace.setUpdateTime(new Date());; + boolean save = sysWorkplaceService.updateWorkplace(sysWorkplace); if (!save) { return ResultVOUtils.error("更新错误"); } diff --git a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java index 5e1a3d7b5..a0ec9242d 100644 --- a/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java +++ b/src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java @@ -138,6 +138,7 @@ public class CollectOrderRequest extends ListPageRequest { private String startTime; private String endTime; + private String keyWord; private List documentTypeCodes; diff --git a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java index 863c97250..767dd49bb 100644 --- a/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java +++ b/src/main/java/com/glxp/api/res/collect/IoCollectOrderResponse.java @@ -169,6 +169,11 @@ public class IoCollectOrderResponse { */ private String errorMsg; + /** + * 第三地业务类型名称 + */ + private String actionName; + public String getFromName() { if (StrUtil.isNotEmpty(fromCorpName)) diff --git a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java index e1b2ae16b..44032bf6d 100644 --- a/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java +++ b/src/main/java/com/glxp/api/service/auth/SysWorkplaceService.java @@ -7,9 +7,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.glxp.api.dao.auth.SysWorkplaceDao; import com.glxp.api.entity.auth.SysWorkplace; +import com.glxp.api.exception.JsonException; import com.glxp.api.req.auth.SysWorkplaceRequest; +import com.glxp.api.req.basic.WorkBindBusTypeRequest; +import com.glxp.api.res.basic.SysWorkplaceDocumentResponse; import com.glxp.api.res.basic.SysWorkplaceResponse; +import com.glxp.api.service.basic.SysWorkplaceDocumentService; +import org.apache.poi.ss.formula.functions.Offset; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.Collections; @@ -25,6 +31,9 @@ public class SysWorkplaceService extends ServiceImpl().eq(SysWorkplace::getOrderId, code)); } + + + @Transactional(rollbackFor = Exception.class) + public boolean updateWorkplace(SysWorkplace sysWorkplace) { + if (sysWorkplace.getWorkplaceStatus() == 0 ){ + //更改停用 判断是否含有工位类型 + WorkBindBusTypeRequest request = new WorkBindBusTypeRequest(); + request.setWorkplaceCode(sysWorkplace.getWorkplaceId()); + List page = sysWorkplaceDocumentService.filterListByWorkplace(request); + if (page != null || page.size() >0 ){ + throw new JsonException(500,"当前工位已作业，请解绑之后暂停工位"); + } + } + boolean b = this.updateById(sysWorkplace); + if (!b){ + return false; + } + return true; + } } diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml index 2b318886d..24f676a16 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml @@ -23,6 +23,7 @@ ico.fromCorpName, ico.tagMsg, sys_workplace_document.busName busTypeName, + thr_bustype_origin.name actionName, sw.workplaceName, ico.id, ico.orderTime, @@ -32,6 +33,7 @@ row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence FROM io_collect_order ico left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode + left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action left join basic_corp bc on ico.fromCorp = bc.erpId left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml index 2f70bc83d..0f8af88ca 100644 --- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml +++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderOriginMapper.xml @@ -24,6 +24,7 @@ ico.fromCorpName, ico.tagMsg, sys_workplace_document.busName busTypeName, + thr_bustype_origin.name actionName, sw.workplaceName, ico.id, ico.orderTime, @@ -33,6 +34,7 @@ row_number() over ( order by case when ico.orderTime is null then ico.createTime else ico.orderTime end desc ) as orderSequence FROM io_collect_order_origin ico left join sys_workplace_document on ico.busType = sys_workplace_document.documentTypeCode + left join thr_bustype_origin on sys_workplace_document.documentTypeCode = thr_bustype_origin.action left join basic_corp bc on ico.fromCorp = bc.erpId left join sys_workplace sw on ico.workPlaceCode = sw.workplaceId @@ -70,6 +72,7 @@ AND ( ico.billNo like concat('%', #{unionKey}, '%') or ico.fromCorp like concat('%', #{unionKey}, '%') + or ico.fromType like concat('%', #{unionKey}, '%') or ico.fromCorpName like concat('%', #{unionKey}, '%') or ico.backupOrderRemark1 like concat('%', #{unionKey}, '%') or ico.backupOrderRemark2 like concat('%', #{unionKey}, '%') @@ -78,8 +81,6 @@ or ico.backupOrderRemark5 like concat('%', #{unionKey}, '%') or ico.backupOrderRemark6 like concat('%', #{unionKey}, '%')) - - and tagStatus in