9/10 优化1.0

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

@@ -79,6 +79,9 @@ public class SysWorkplaceDocumentController extends BaseController {
         if (entity.getInvCode() == null){
             entity.setInvCode(0);
         }
+        if (entity.getScanType() == 1){
+            entity.setOrderFinishVerify(4);
+        }
 
         boolean save = sysWorkplaceDocumentService.updateById(entity);
         if (!save) {

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

@@ -0,0 +1,16 @@
+package com.glxp.api.dao.collect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.glxp.api.entity.collect.IoCollectOrder;
+import com.glxp.api.entity.collect.IoCollectOrderBackup;
+import com.glxp.api.req.collect.CollectOrderRequest;
+import com.glxp.api.res.collect.IoCollectOrderResponse;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface IoCollectOrderBackupMapper extends BaseMapper<IoCollectOrderBackup> {
+
+}

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

@@ -0,0 +1,12 @@
+package com.glxp.api.dao.collect;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+import com.glxp.api.entity.collect.IoCollectOrderBizBackup;
+import org.apache.ibatis.annotations.Mapper;
+
+
+@Mapper
+public interface IoCollectOrderBizBackupMapper extends BaseMapper<IoCollectOrderBizBackup> {
+
+}

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

@@ -84,7 +84,7 @@ public class SysWorkplaceDocumentEntity {
     private Integer checkInsert;
 
     /**
-     * 所属仓库
+     * 所属仓库  0:用于前端空白显示
      */
     @ApiModelProperty("所属仓库")
     @TableField(value = "invCode")
@@ -148,7 +148,7 @@ public class SysWorkplaceDocumentEntity {
     private Integer monopoly;
 
     /**
-     * 单据完成校验： 0:完全赋码 ; 1:部分赋码，2：赋码超出
+     * 单据完成校验： 0:完全赋码 ; 1:部分赋码; 2:赋码超乎 4:扫码单生成业务单的时候设置的值 只用于前端的空白显示
      */
     @TableField(value = "orderFinishVerify")
     private Integer orderFinishVerify;

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

@@ -0,0 +1,249 @@
+package com.glxp.api.entity.collect;
+
+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 com.glxp.api.res.collect.CollectOrderBizResponse;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 采集点单据主表
+ */
+@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrder")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "io_collect_order_backup")
+public class IoCollectOrderBackup implements Serializable {
+    @TableId(value = "id", type = IdType.INPUT)
+    @ApiModelProperty(value = "")
+    private Integer id;
+
+    /**
+     * 单据号
+     */
+    @TableField(value = "billNo")
+    @ApiModelProperty(value = "单据号")
+    private String billNo;
+
+    /**
+     * 单据类型
+     */
+    @TableField(value = "busType")
+    @ApiModelProperty(value = "单据类型")
+    private String busType;
+
+    /**
+     * 来源业务
+     */
+    @TableField(value = "fromType")
+    @ApiModelProperty(value = "来源业务")
+    private String fromType;
+
+    /**
+     * 来源业务说明
+     */
+    @TableField(value = "fromTypeDesc")
+    @ApiModelProperty(value = "来源业务说明")
+    private String fromTypeDesc;
+
+    /**
+     * 往来信息
+     */
+    @TableField(value = "fromCorp")
+    @ApiModelProperty(value = "往来信息")
+    private String fromCorp;
+
+    /**
+     * 往来信息名称
+     */
+    @TableField(value = "fromCorpName")
+    @ApiModelProperty(value = "往来信息名称")
+    private String fromCorpName;
+
+    /**
+     * 单据时间
+     */
+    @TableField(value = "billTime")
+    @ApiModelProperty(value = "单据时间")
+    private Date billTime;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 采集时间
+     */
+    @TableField(value = "collectTime")
+    @ApiModelProperty(value = "采集时间")
+    private Date collectTime;
+
+    /**
+     * 采集点编码
+     */
+    @TableField(value = "collectCode")
+    @ApiModelProperty(value = "采集点编码")
+    private String collectCode;
+
+    /**
+     * 工位编码
+     */
+    @TableField(value = "workPlaceCode")
+    @ApiModelProperty(value = "工位编码")
+    private Long workPlaceCode;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    @TableField(value = "`createUser`")
+    @ApiModelProperty(value = "创建人")
+    private String createUser;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 更新人
+     */
+    @TableField(value = "updateUser")
+    @ApiModelProperty(value = "更新人")
+    private Long updateUser;
+    /**
+     * 赋码状态  0:原始单据未处理，1:已分配工位待处理；2：处理中；3：已完成；4：处理异常,-1:草稿，挂起状态，5：库存不足
+     */
+    @TableField(value = "tagStatus")
+    private Integer tagStatus;
+
+    /**
+     * 拆零状态：0：未拆零，1，正在拆零；2,已完成；3.拆零失败
+     */
+    @TableField(value = "splitStatus")
+    private Integer splitStatus;
+
+    /**
+     * 拆零异常信息
+     */
+    @TableField(value = "splitMsg")
+    private String splitMsg;
+
+
+    /**
+     * 处方赋码信息
+     */
+    @TableField(value = "tagMsg")
+    private String tagMsg;
+
+    /**
+     * 单据流通方式： 1:配送流通; 2:出库使用
+     */
+    @TableField(value = "orderCirType")
+    private Integer orderCirType;
+
+
+    /**
+     * 单据备注1
+     */
+    @TableField(value = "backupOrderRemark1")
+    @ApiModelProperty(value = "单据备注1")
+    private String backupOrderRemark1;
+
+    /**
+     * 单据备注2
+     */
+    @TableField(value = "backupOrderRemark2")
+    @ApiModelProperty(value = "单据备注2")
+    private String backupOrderRemark2;
+
+    /**
+     * 单据备注3
+     */
+    @TableField(value = "backupOrderRemark3")
+    @ApiModelProperty(value = "单据备注3")
+    private String backupOrderRemark3;
+
+    /**
+     * 单据备注4
+     */
+    @TableField(value = "backupOrderRemark4")
+    @ApiModelProperty(value = "单据备注4")
+    private String backupOrderRemark4;
+
+    /**
+     * 单据备注5
+     */
+    @TableField(value = "backupOrderRemark5")
+    @ApiModelProperty(value = "单据备注5")
+    private String backupOrderRemark5;
+
+    /**
+     * 单据备注6
+     */
+    @TableField(value = "backupOrderRemark6")
+    @ApiModelProperty(value = "单据备注6")
+    private String backupOrderRemark6;
+
+    /**
+     * 排序时间
+     */
+    @TableField(value = "orderTime")
+    @ApiModelProperty(value = "排序时间")
+    private Date orderTime;
+
+
+    /**
+     * 库存预警： 1:上锁正常; 2:上锁不足；3:已释放锁
+     */
+    @TableField(value = "invAlert")
+    private Integer invAlert;
+    @TableField(exist = false)
+    private List<CollectOrderBizResponse> collectOrderBizResponseList;
+
+    @TableField(exist = false)
+    private List<IoCollectOrderBiz> bizList;
+
+    /**
+     * 异常信息
+     */
+    @TableField(value = "errorMsg")
+    private String errorMsg;
+
+    /**
+     *上传状态(1.未上传,2.已上传,3.上传失败)
+     */
+    @TableField(value = "uploadStatus")
+    private Integer uploadStatus;
+
+    /**
+     *上传错误信息
+     */
+    @TableField(value = "uploadError")
+    private String uploadError;
+
+    private static final long serialVersionUID = 1L;
+}

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

@@ -0,0 +1,209 @@
+package com.glxp.api.entity.collect;
+
+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.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 采集点单据详情
+ */
+@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderBiz")
+@Data
+@Builder
+@AllArgsConstructor
+@NoArgsConstructor
+@TableName(value = "io_collect_order_biz_backup")
+public class IoCollectOrderBizBackup implements Serializable {
+    @TableId(value = "id", type = IdType.AUTO)
+    @ApiModelProperty(value = "")
+    private Long id;
+    /**
+     * 单据号外键
+     */
+    @TableField(value = "orderIdFk")
+    private String orderIdFk;
+
+
+    /**
+     * 耗材字典ID
+     */
+    @TableField(value = "relId")
+    @ApiModelProperty(value = "耗材字典ID")
+    private Long relId;
+
+
+    /**
+     * 院内编码（第三方编码）
+     */
+    @TableField(value = "thrCode")
+    @ApiModelProperty(value = "院内编码（第三方编码）")
+    private String thrCode;
+
+    /**
+     * 医保编码
+     */
+    @TableField(value = "ybbm")
+    @ApiModelProperty(value = "医保编码")
+    private String ybbm;
+
+    /**
+     * 收费编码
+     */
+    @TableField(value = "payFeeCode")
+    @ApiModelProperty(value = "收费编码")
+    private String payFeeCode;
+
+    /**
+     * 产品通用名称
+     */
+    @TableField(value = "cpmctymc")
+    @ApiModelProperty(value = "产品通用名称")
+    private String cpmctymc;
+
+    /**
+     * 产品标识
+     */
+    @TableField(value = "nameCode")
+    @ApiModelProperty(value = "产品标识")
+    private String nameCode;
+
+    /**
+     * 规格型号
+     */
+    @TableField(value = "ggxh")
+    @ApiModelProperty(value = "规格型号")
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    @TableField(value = "batchNo")
+    @ApiModelProperty(value = "批次号")
+    private String batchNo;
+
+    /**
+     * 生产日期
+     */
+    @TableField(value = "productDate")
+    @ApiModelProperty(value = "生产日期")
+    private String productDate;
+
+    /**
+     * 失效日期
+     */
+    @TableField(value = "expireDate")
+    @ApiModelProperty(value = "失效日期")
+    private String expireDate;
+
+    /**
+     * 单据数量
+     */
+    @TableField(value = "`count`")
+    @ApiModelProperty(value = "单据数量")
+    private Integer count;
+
+    /**
+     * 实际数量
+     */
+    @TableField(value = "actCount")
+    @ApiModelProperty(value = "实际数量")
+    private Integer actCount;
+
+    /**
+     * 扫码数量
+     */
+    @TableField(value = "scanCount")
+    @ApiModelProperty(value = "扫码数量")
+    private Integer scanCount;
+
+    /**
+     * 扫码实际数量
+     */
+    @TableField(value = "scanActCount")
+    @ApiModelProperty(value = "扫码实际数量")
+    private Integer scanActCount;
+
+    /**
+     * 计量单位
+     */
+    @TableField(value = "measureUnit")
+    @ApiModelProperty(value = "计量单位")
+    private String measureUnit;
+
+    /**
+     * 单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码
+     */
+    @TableField(value = "tagStatus")
+    @ApiModelProperty(value = "单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码")
+    private Integer tagStatus;
+
+    /**
+     * 赋码错误信息
+     */
+    @TableField(value = "tagMsg")
+    @ApiModelProperty(value = "赋码错误信息")
+    private String tagMsg;
+
+    /**
+     * 备注
+     */
+    @TableField(value = "remark")
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 创建时间
+     */
+    @TableField(value = "createTime")
+    @ApiModelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField(value = "updateTime")
+    @ApiModelProperty(value = "更新时间")
+    private Date updateTime;
+
+    /**
+     * 未拆零数量
+     */
+    @TableField(value = "unTagCount")
+    @ApiModelProperty(value = "未拆零数量")
+    private Integer unTagCount;
+
+
+    /**
+     * 自动扫描分配的工位存量 锁数量
+     */
+    @TableField(value = "autoResCount")
+    @ApiModelProperty(value = "自动扫描分配的工位存量")
+    private Integer autoResCount;
+
+    /**
+     * 上传替换码
+     */
+    @TableField(value = "replaceCode")
+    @ApiModelProperty(value = "上传替换码")
+    private String replaceCode;
+
+    /**
+     * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
+     */
+    @TableField(value = "autoTagStatus")
+    @ApiModelProperty(value = "autoTagStatus")
+    private Integer autoTagStatus;
+
+
+    private static final long serialVersionUID = 1L;
+}

src/main/java/com/glxp/api/service/basic/SysWorkplaceDocumentService.java

@@ -94,6 +94,10 @@ public class SysWorkplaceDocumentService extends ServiceImpl<SysWorkplaceDocumen
         if (entity.getInvCode() == null){
             entity.setInvCode(0);
         }
+        if (entity.getScanType() == 1){
+            //用于前端显示
+            entity.setOrderFinishVerify(4);
+        }
         Integer number = sysWorkplaceDocumentDao.findMaxNumberByWorkplaceCode(entity.getWorkplaceCode());
         if (number == null){
             //为空 默认1

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

@@ -0,0 +1,13 @@
+package com.glxp.api.service.collect;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.collect.IoCollectOrderBackupMapper;
+import com.glxp.api.entity.collect.*;
+import org.springframework.stereotype.Service;
+
+@Service
+public class IoCollectOrderBackupService extends ServiceImpl<IoCollectOrderBackupMapper, IoCollectOrderBackup> {
+
+
+}

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

@@ -0,0 +1,14 @@
+package com.glxp.api.service.collect;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.glxp.api.dao.collect.IoCollectOrderBizBackupMapper;
+import com.glxp.api.entity.collect.IoCollectOrderBizBackup;
+import org.springframework.stereotype.Service;
+
+
+@Service
+public class IoCollectOrderBizBackupService extends ServiceImpl<IoCollectOrderBizBackupMapper, IoCollectOrderBizBackup> {
+
+
+}

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

@@ -18,7 +18,7 @@
             <if test="documentTypeCode != '' and documentTypeCode != null">
                 AND documentTypeCode = #{documentTypeCode}
             </if>
-            <if test="isPopular != '' and isPopular != null">
+            <if test="isPopular >= 0 and isPopular != null">
                 AND isPopular = #{isPopular}
             </if>
             <if test="busKey != null and busKey != ''">

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

@@ -0,0 +1,5 @@
+<?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.IoCollectOrderBackupMapper">
+
+</mapper>

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

@@ -0,0 +1,5 @@
+<?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.IoCollectOrderBizBackupMapper">
+
+</mapper>

src/main/resources/mybatis/mapper/thrsys/ThrProductsDao.xml

@@ -40,6 +40,9 @@
             <if test="thirdSys != '' and thirdSys != null">
                 AND thirdSysFk = #{thirdSys}
             </if>
+            <if test="productType != '' and productType != null">
+                AND productType = #{productType}
+            </if>
             <if test="supName != '' and supName != null">
                 AND supName LIKE concat('%', #{supName}, '%')
             </if>