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

src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java

@@ -3,6 +3,7 @@ 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.BasicCollectPointEntity;
 import com.glxp.api.entity.basic.BasicCollectUserEntity;
 import com.glxp.api.req.basic.BasicCollectRequest;
@@ -28,13 +29,16 @@ import java.util.List;
  */
 @Slf4j
 @RestController
-public class BasicCollectUserController {
+public class BasicCollectUserController extends BaseController {
 
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
+        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
+            request.setUserId(String.valueOf(getUserId()));
+        }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);
         PageInfo<UserWorkResponse> pageInfo = new PageInfo<>(page);
         PageSimpleResponse<UserWorkResponse> pageSimpleResponse = new PageSimpleResponse<>();

src/main/java/com/glxp/api/req/basic/BasicCollectUserRequest.java

@@ -21,5 +21,7 @@ public class BasicCollectUserRequest extends ListPageRequest {
     private String userKey;
     private String workKey;
 
+    private Integer autoUserId;
+
 
 }

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -95,6 +95,11 @@ public class CollectOrderRequest extends ListPageRequest {
      */
     private Boolean confirmGet;
 
+    /**
+     * 工位用户
+     */
+    private String chargeUser;
+
 
     private Boolean confirmFinish;
 

src/main/java/com/glxp/api/res/collect/CollectOrderBizResponse.java

@@ -122,5 +122,6 @@ public class CollectOrderBizResponse {
     private String splitUdiCode;
     private String unSplitUdiCode;
     private String finishUdiCode;
+    private String bzgg;
 
 }

src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java

@@ -18,6 +18,8 @@ import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderBiz;
 import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
+import com.glxp.api.entity.thrsys.ThrBusTypeOriginEntity;
+import com.glxp.api.entity.thrsys.ThrSystemEntity;
 import com.glxp.api.exception.JsonException;
 import com.glxp.api.req.collect.CollectOrderCodeAutoRequest;
 import com.glxp.api.req.collect.CollectOrderCodeManRequest;
@@ -30,6 +32,8 @@ import com.glxp.api.service.auth.SysWorkplaceService;
 import com.glxp.api.service.basic.BasicCollectBustypeService;
 import com.glxp.api.service.basic.SysWorkplaceDocumentService;
 import com.glxp.api.service.basic.UdiRelevanceService;
+import com.glxp.api.service.thrsys.IThrBusTypeOriginService;
+import com.glxp.api.service.thrsys.ThrSystemService;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
@@ -63,6 +67,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     GennerOrderUtils gennerOrderUtils;
     @Resource
     BasicCollectBustypeService bustypeService;
+
+    @Resource
+    private ThrSystemService thrSystemService;
+    @Resource
+    private IThrBusTypeOriginService thrBusTypeOriginService;
     @Resource
     CustomerService customerService;
     @Resource
@@ -139,8 +148,14 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 if (IntUtil.value(sysWorkplaceDocumentEntity.getIsMatching()) == 1) {
                     collectOrder.setFromType("UDI系统");
                 } else {
-                    BasicCollectBustypeEntity bustypeEntity = bustypeService.findByCode(sysWorkplaceDocumentEntity.getDocumentTypeCode());
+                    ThrBusTypeOriginEntity one = thrBusTypeOriginService.getOne(new LambdaQueryWrapper<ThrBusTypeOriginEntity>()
-                    collectOrder.setFromType(bustypeEntity.getFromType());
+                            .eq(ThrBusTypeOriginEntity::getAction, sysWorkplaceDocumentEntity.getDocumentTypeCode()));
+                    if (one != null){
+                        ThrSystemEntity thrSystemEntity = thrSystemService.getOne(new LambdaQueryWrapper<ThrSystemEntity>().eq(ThrSystemEntity::getThirdId, one.getThirdSys()));
+                        if (thrSystemEntity != null){
+                            collectOrder.setFromType(thrSystemEntity.getThirdName());
+                        }
+                    }
                 }
                 collectOrderService.save(collectOrder);
             } else {

src/main/resources/mybatis/mapper/auth/SysWorkplaceDao.xml

@@ -7,13 +7,12 @@
     </select>
     <select id="filterList" resultType="com.glxp.api.res.basic.SysWorkplaceResponse">
         select sw.*, aw.name invName,auth_user.employeeName as employeeName,scps.name as categoryName,
-        bcb.code as busTypeCode,bcb.name as busTypeName,bcb.fromType as fromTypeName,ad.name as deptCodeName
+        ad.name as deptCodeName
         from sys_workplace sw
         left join auth_dept ad on sw.deptCode = ad.code
         left join auth_warehouse aw on sw.invCode = aw.code
         left join auth_user on sw.chargeUser = auth_user.id
         left join basic_collect_point_category scps on sw.constituencies = scps.code
-        left join basic_collect_bustype bcb on sw.orderId = bcb.code
         <where>
             <if test="request.key != null and request.key != ''">
                 AND (sw.workplaceName like concat('%', #{request.key}, '%')

src/main/resources/mybatis/mapper/basic/SysWorkplaceDocumentDao.xml

@@ -5,11 +5,11 @@
         select sys_workplace_document.*,
                aw.name                    invName,
                basic_bussiness_type.name  innerBusName,
-               basic_collect_bustype.name outBusName
+               thr_bustype_origin.name outBusName
         from sys_workplace_document
                  left join auth_warehouse aw on aw.code = sys_workplace_document.invCode
                  left join basic_bussiness_type on sys_workplace_document.documentTypeCode = basic_bussiness_type.action
-                 left join basic_collect_bustype on basic_collect_bustype.fromBusTypeCode = sys_workplace_document.documentTypeCode
+                 left join thr_bustype_origin on thr_bustype_origin.action = sys_workplace_document.documentTypeCode
 
         <where>
             <if test="workplaceCode != '' and workplaceCode != null">

src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBizMapper">
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
-        SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory
+        SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory,bp.bzgg
         FROM io_collect_order_biz icob
                  left join basic_udirel bu on icob.relId = bu.id
                  left join basic_products bp on bu.uuid = bp.uuid

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -43,6 +43,9 @@
             <if test="workPlaceCode != null ">
                 AND ico.workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="chargeUser != null ">
+                AND sw.chargeUser = #{chargeUser}
+            </if>
             <if test="unionKey != null ">
                 AND
                 (