9/14 优化

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());
+        sysWorkplace.setUpdateTime(new Date());;
-        boolean save = sysWorkplaceService.updateById(sysWorkplace);
+        boolean save = sysWorkplaceService.updateWorkplace(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("更新错误");
         }

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<String> documentTypeCodes;
 

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))

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<SysWorkplaceDao, SysWorkpla
     @Resource
     SysWorkplaceDao sysWorkplaceDao;
 
+    @Resource
+    private SysWorkplaceDocumentService sysWorkplaceDocumentService;
+
     public Long maxWorkplaceId() {
         return super.baseMapper.selectMaxWorkplaceId();
     }
@@ -53,4 +62,23 @@ public class SysWorkplaceService extends ServiceImpl<SysWorkplaceDao, SysWorkpla
 //        return super.baseMapper.selectList(
 //                new LambdaQueryWrapper<SysWorkplace>().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<SysWorkplaceDocumentResponse> 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;
+    }
 }

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
         <where>

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
         <where>
@@ -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}, '%'))
             </if>
-
-
             <if test="tagStatusList != null and tagStatusList.size() > 0">
                 and tagStatus in
                 <foreach collection="tagStatusList" item="item" index="index" separator="," open="(" close=")">