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

src/main/java/com/glxp/api/controller/auth/SysWorkplaceController.java

@@ -27,6 +27,7 @@ import com.glxp.api.req.basic.WorkBindBusTypeRequest;
 import com.glxp.api.req.dev.DeviceInfoDetailQuery;
 import com.glxp.api.req.system.PrintLabelRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.basic.SysWorkplaceDocumentResponse;
 import com.glxp.api.res.basic.SysWorkplaceResponse;
 import com.glxp.api.res.basic.UserWorkResponse;
 import com.glxp.api.res.basic.WorkBindWorkResponse;
@@ -143,10 +144,10 @@ public class SysWorkplaceController extends BaseController {
         }
         WorkBindBusTypeRequest workBindBusTypeRequest = new WorkBindBusTypeRequest();
         workBindBusTypeRequest.setWorkplaceCode(String.valueOf(sysWorkplace.getWorkplaceId()));
-//        List<WorkBindWorkResponse> workBindWorkResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
+        List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = sysWorkplaceDocumentService.filterList(workBindBusTypeRequest);
-//        if (workBindWorkResponses.size() > 0) {
+        if (sysWorkplaceDocumentResponses.size() > 0) {
-//            return ResultVOUtils.error("当前工位已绑定单据类型,请解绑之后在删除");
+            return ResultVOUtils.error("当前工位已绑定单据,请解绑之后在删除");
-//        }
+        }
         boolean save = sysWorkplaceService.removeById(sysWorkplace);
         if (!save) {
             return ResultVOUtils.error("删除错误");

src/main/java/com/glxp/api/controller/collect/IoCollectCodeController.java

@@ -1,17 +1,51 @@
 package com.glxp.api.controller.collect;
 
+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.req.collect.CollectOrderCodeManRequest;
+import com.glxp.api.req.collect.IoCollectCodeRequest;
+import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.collect.CollectOrderCodeManResponse;
+import com.glxp.api.res.collect.IoCollectCodeResponse;
 import com.glxp.api.service.collect.IoCollectCodeService;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.util.List;
 
 @Slf4j
 @RestController
 public class IoCollectCodeController extends BaseController {
+
+
+
     @Resource
     IoCollectCodeService collectCodeService;
 
+    /**
+     * 追溯码查询
+     * @param
+     * @param bindingResult
+     * @return
+     */
+    @GetMapping("/udiwms/basic/collect/ioCollectCode/list")
+    public BaseResponse manuCodeList(IoCollectCodeRequest IoCollectCodeRequest,
+                                     BindingResult bindingResult) {
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
+        List<IoCollectCodeResponse> collectOrderCodeManResponses = collectCodeService.filterList(IoCollectCodeRequest);
+        PageInfo<IoCollectCodeResponse> pageInfo = new PageInfo<>(collectOrderCodeManResponses);
+        PageSimpleResponse<IoCollectCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(collectOrderCodeManResponses);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
 
 }

src/main/java/com/glxp/api/dao/collect/IoCollectCodeMapper.java

@@ -2,8 +2,13 @@ package com.glxp.api.dao.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.glxp.api.entity.collect.IoCollectCode;
+import com.glxp.api.req.collect.IoCollectCodeRequest;
+import com.glxp.api.res.collect.IoCollectCodeResponse;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface IoCollectCodeMapper extends BaseMapper<IoCollectCode> {
-}
+    List<IoCollectCodeResponse> filterList(IoCollectCodeRequest ioCollectCodeRequest);
+}

src/main/java/com/glxp/api/entity/basic/SysWorkplaceDocumentEntity.java

@@ -122,5 +122,14 @@ public class SysWorkplaceDocumentEntity {
     @TableField(value = "inoutType")
     private Integer inoutType;
 
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    private String remark;
+
+
+
+
 }
 

src/main/java/com/glxp/api/entity/collect/IoCollectCode.java

@@ -125,6 +125,22 @@ public class IoCollectCode implements Serializable {
     @ApiModelProperty(value = "出入库类型")
     private Integer inoutType;
 
+    /**
+     * 扫码数量
+     */
+    @TableField(value = "scanCount")
+    @ApiModelProperty(value = "出入库类型")
+    private Integer scanCount;
+
+
+
+    /**
+     * 耗材字典外键id
+     */
+    @TableField(value = "relId")
+    @ApiModelProperty(value = "耗材字典外键id")
+    private String relId;
+
 
     private static final long serialVersionUID = 1L;
 }

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

@@ -0,0 +1,21 @@
+package com.glxp.api.req.collect;
+
+import com.glxp.api.util.page.ListPageRequest;
+import lombok.Data;
+
+/**
+ * @author : zhangsan
+ * @date : 2024/8/26 16:29
+ * @modyified By :
+ */
+
+@Data
+public class IoCollectCodeRequest extends ListPageRequest {
+
+    private String code;
+    private String workPlaceCode;
+    private String billNo;
+    private String fromType;
+    private String fromCorp;
+
+}

src/main/java/com/glxp/api/res/basic/SysWorkplaceDocumentResponse.java

@@ -120,6 +120,8 @@ public class SysWorkplaceDocumentResponse {
      */
     private Integer inoutType;
 
+    private String remark;
+
 
     private String innerBusName;
     private String outBusName;

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

@@ -0,0 +1,107 @@
+package com.glxp.api.res.collect;
+
+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 : zhangsan
+ * @date : 2024/8/26 16:31
+ * @modyified By :
+ */
+
+@Data
+public class IoCollectCodeResponse {
+
+
+    private Integer id;
+
+    /**
+     * 追溯码（UDI.药品）
+     */
+    private String code;
+
+    /**
+     * 单据来源
+     */
+    private String fromType;
+
+    /**
+     * 单据类型
+     */
+    private String busType;
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
+    /**
+     * 往来单位
+     */
+    private String fromCorp;
+
+    /**
+     * 操作时间
+     */
+    private Date operTime;
+
+    /**
+     * 操作人
+     */
+    private String operUser;
+
+    /**
+     * 采集点
+     */
+    private String collectCode;
+
+    /**
+     * 采集点负责人
+     */
+    private String collectUser;
+
+    /**
+     * 工位
+     */
+    private Long workPlaceCode;
+
+    /**
+     * 工位负责人
+     */
+    private String workPlaceUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 赋码方式 1:自动拆零赋码；2:自动整取赋码;3.手动赋码
+     */
+    private Integer fifoSplit;
+
+    /**
+     * 出入库类型（1：入库；2：出库）
+     */
+    private Integer inoutType;
+
+    /**
+     * 扫码数量
+     */
+    private Integer scanCount;
+
+    private String workplaceName;
+    private String busTypeName;
+//    private String nameCode;
+    private String cpmctymc;
+    private String ggxh;
+    private String zczbhhzbapzbh;
+    private String manufactory;
+
+}

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

@@ -2,17 +2,21 @@ package com.glxp.api.service.collect;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.entity.collect.IoCollectOrder;
 import com.glxp.api.entity.collect.IoCollectOrderCodeAuto;
 import com.glxp.api.entity.collect.IoCollectOrderCodeMan;
 import com.glxp.api.req.collect.CollectOrderBizRequest;
+import com.glxp.api.req.collect.IoCollectCodeRequest;
 import com.glxp.api.res.collect.CollectOrderBizResponse;
+import com.glxp.api.res.collect.IoCollectCodeResponse;
 import com.glxp.api.util.IntUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -35,6 +39,23 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
     @Resource
     IoCollectOrderService collectOrderService;
 
+
+    /**
+     * 追溯码查询
+     * @param ioCollectCodeRequest
+     * @return
+     */
+    public List<IoCollectCodeResponse> filterList(IoCollectCodeRequest ioCollectCodeRequest) {
+        if (ioCollectCodeRequest == null) {
+            return Collections.emptyList();
+        }
+        if (ioCollectCodeRequest.getPage() != null) {
+            int offset = (ioCollectCodeRequest.getPage() - 1) * ioCollectCodeRequest.getLimit();
+            PageHelper.offsetPage(offset, ioCollectCodeRequest.getLimit());
+        }
+        return super.baseMapper.filterList(ioCollectCodeRequest);
+    }
+
     /**
      * 根据单号插入扫码明细
      */
@@ -130,4 +151,5 @@ public class IoCollectCodeService extends ServiceImpl<IoCollectCodeMapper, IoCol
         saveBatch(ioCollectCodes);
     }
 
+
 }

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

@@ -1,4 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.collect.IoCollectCodeMapper">
+    <select id="filterList" resultType="com.glxp.api.res.collect.IoCollectCodeResponse">
+        SELECT icc.*,sw.workplaceName,
+        COALESCE(thr_bustype_origin.name, basic_bussiness_type.name) as busTypeName,
+        bp.nameCode,
+        bp.cpmctymc,
+        COALESCE(bp.ggxh, bp.bzgg) AS ggxh,
+        bp.zczbhhzbapzbh,
+        bp.manufactory
+        from io_collect_code icc
+        left join sys_workplace sw on sw.workplaceId = icc.workPlaceCode
+        left join thr_bustype_origin on icc.busType = thr_bustype_origin.action
+        left join basic_bussiness_type on icc.busType = basic_bussiness_type.action
+        left join basic_udirel bu on icc.relId = bu.id
+        left join basic_products bp on bu.uuid = bp.uuid
+        <where>
+            <if test="workPlaceCode != '' and workPlaceCode != null">
+                AND icc.workPlaceCode LIKE concat('%', #{workPlaceCode}, '%')
+            </if>
+            <if test="code != '' and code != null">
+                AND icc.code LIKE concat('%', #{code}, '%')
+            </if>
+            <if test="billNo != null and billNo != ''">
+                AND icc.billNo LIKE concat('%', #{billNo}, '%')
+            </if>
+            <if test="fromType != null and fromType != ''">
+                AND icc.fromType LIKE concat('%', #{fromType}, '%')
+            </if>
+            <if test="fromCorp != null and fromCorp != ''">
+                AND icc.fromCorp LIKE concat('%', #{fromCorp}, '%')
+            </if>
+        </where>
+        group by icc.id
+    </select>
 </mapper>

src/main/resources/schemas/schema_v2.4.sql

@@ -4256,6 +4256,18 @@ CALL Pro_Temp_ColumnWork('basic_products', 'workPlaceCount',
                          'int NULL DEFAULT NULL COMMENT ''工位预警数量''',
                          1);
 
+CALL Pro_Temp_ColumnWork('io_collect_code', 'scanCount',
+                         'int NULL DEFAULT NULL COMMENT ''扫码数量''',
+                         1);
+CALL Pro_Temp_ColumnWork('io_collect_code', 'relId',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''耗材字典外键id''',
+                         1);
+
+
+CALL Pro_Temp_ColumnWork('sys_workplace_document', 'remark',
+                         'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注''',
+                         1);
+
 
 CALL Pro_Temp_ColumnWork('io_collect_order_biz', 'autoResCount',
                          'int NULL DEFAULT NULL COMMENT ''自动扫描分配的工位存量''',