扫码问题，器械处方扫码教研问题

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

@@ -356,5 +356,4 @@ public class IoCollectOrderCodeManController extends BaseController {
     }
 
 
-
 }

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -235,6 +235,9 @@ public class IoCodeTempController extends BaseController {
         String originCode = addEnterCodeRequest.getOriginCode();
         if (originCode == null)
             originCode = "";
+        if (addEnterCodeRequest.getCode().contains(originCode)) {
+            addEnterCodeRequest.setCode(addEnterCodeRequest.getCode().replace(originCode, ""));
+        }
         code = originCode + addEnterCodeRequest.getCode();
         String newCode = addEnterCodeRequest.getCode();
 
@@ -1610,8 +1613,8 @@ public class IoCodeTempController extends BaseController {
 //           if (StrUtil.isEmpty(codeEnttity.getBatchNo())) {
                 //当关联关系存在的时候 以关联关系的批次号为准
                 codeEnttity.setBatchNo(codeRelEntity.getBatchNo());
-                codeEnttity.setProduceDate( MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
+                codeEnttity.setProduceDate(MsDateUtil.formatDate(codeRelEntity.getMadeDate(), "yyMMdd"));
-                codeEnttity.setExpireDate( MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
+                codeEnttity.setExpireDate(MsDateUtil.formatDate(codeRelEntity.getValidateDate(), "yyMMdd"));
 //                }
             }
 
@@ -1842,7 +1845,7 @@ public class IoCodeTempController extends BaseController {
                 updateRelCode(bussinessTypeEntity, code);
 //                relCodeBatchService.threadUpdateIoCodeTempEntity(code);
 //            } else if (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable()) {
-            } else if ( (bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable())) {
+            } else if ((bussinessTypeEntity.getCheckWebNew() == 2 && bussinessTypeEntity.isCheckEnable())) {
                 String errMsg = ioCheckInoutService.checkDrugNoPiCode(codeEnttity);
                 if (errMsg != null) {
                     return ResultVOUtils.error(500, errMsg);

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

@@ -273,6 +273,11 @@ public class IoCollectOrderBiz implements Serializable {
     @TableField(value = "remark10")
     private String remark10;
 
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
 
     /**
      * 取货确认状态
@@ -303,5 +308,7 @@ public class IoCollectOrderBiz implements Serializable {
 
     @TableField(exist = false)
     private String queueCode;
+
+
     private static final long serialVersionUID = 1L;
 }

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

@@ -223,6 +223,10 @@ public class IoCollectOrderBizBackup implements Serializable {
     private String remark9;
     @TableField(value = "remark10")
     private String remark10;
-
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
     private static final long serialVersionUID = 1L;
 }

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

@@ -6,264 +6,270 @@ import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
 import java.io.Serializable;
 import java.util.Date;
+
 import lombok.Data;
 
 /**
  * 采集点单据详情
  */
-@ApiModel(value="com-glxp-api-entity-collect-IoCollectOrderBizOrigin")
+@ApiModel(value = "com-glxp-api-entity-collect-IoCollectOrderBizOrigin")
 @Data
 @TableName(value = "io_collect_order_biz_origin")
 public class IoCollectOrderBizOrigin implements Serializable {
     @TableId(value = "id", type = IdType.AUTO)
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private Long id;
 
     /**
      * 单据号
      */
     @TableField(value = "orderIdFk")
-    @ApiModelProperty(value="单据号")
+    @ApiModelProperty(value = "单据号")
     private String orderIdFk;
 
     /**
      * 物资字典ID
      */
     @TableField(value = "relId")
-    @ApiModelProperty(value="物资字典ID")
+    @ApiModelProperty(value = "物资字典ID")
     private Long relId;
 
     /**
      * 院内编码（第三方编码）
      */
     @TableField(value = "thrCode")
-    @ApiModelProperty(value="院内编码（第三方编码）")
+    @ApiModelProperty(value = "院内编码（第三方编码）")
     private String thrCode;
 
     /**
      * 医保编码
      */
     @TableField(value = "ybbm")
-    @ApiModelProperty(value="医保编码")
+    @ApiModelProperty(value = "医保编码")
     private String ybbm;
 
     /**
      * 收费编码
      */
     @TableField(value = "payFeeCode")
-    @ApiModelProperty(value="收费编码")
+    @ApiModelProperty(value = "收费编码")
     private String payFeeCode;
 
     /**
      * 商品条码
      */
     @TableField(value = "sptm")
-    @ApiModelProperty(value="商品条码")
+    @ApiModelProperty(value = "商品条码")
     private String sptm;
 
     /**
      * 产品通用名称
      */
     @TableField(value = "cpmctymc")
-    @ApiModelProperty(value="产品通用名称")
+    @ApiModelProperty(value = "产品通用名称")
     private String cpmctymc;
 
     /**
      * 产品标识
      */
     @TableField(value = "nameCode")
-    @ApiModelProperty(value="产品标识")
+    @ApiModelProperty(value = "产品标识")
     private String nameCode;
 
     /**
      * 批次号
      */
     @TableField(value = "batchNo")
-    @ApiModelProperty(value="批次号")
+    @ApiModelProperty(value = "批次号")
     private String batchNo;
 
     /**
      * 生产日期
      */
     @TableField(value = "productDate")
-    @ApiModelProperty(value="生产日期")
+    @ApiModelProperty(value = "生产日期")
     private String productDate;
 
     /**
      * 失效日期
      */
     @TableField(value = "expireDate")
-    @ApiModelProperty(value="失效日期")
+    @ApiModelProperty(value = "失效日期")
     private String expireDate;
 
     /**
      * 单据数量
      */
     @TableField(value = "count")
-    @ApiModelProperty(value="单据数量")
+    @ApiModelProperty(value = "单据数量")
     private Integer count;
 
     /**
      * 未拆零数量
      */
     @TableField(value = "unTagCount")
-    @ApiModelProperty(value="未拆零数量")
+    @ApiModelProperty(value = "未拆零数量")
     private Integer unTagCount;
 
     /**
      * 实际数量
      */
     @TableField(value = "actCount")
-    @ApiModelProperty(value="实际数量")
+    @ApiModelProperty(value = "实际数量")
     private Integer actCount;
 
     /**
      * 扫码数量
      */
     @TableField(value = "scanCount")
-    @ApiModelProperty(value="扫码数量")
+    @ApiModelProperty(value = "扫码数量")
     private Integer scanCount;
 
     /**
      * 扫码实际数量
      */
     @TableField(value = "scanActCount")
-    @ApiModelProperty(value="扫码实际数量")
+    @ApiModelProperty(value = "扫码实际数量")
     private Integer scanActCount;
 
     /**
      * 规格型号
      */
     @TableField(value = "ggxh")
-    @ApiModelProperty(value="规格型号")
+    @ApiModelProperty(value = "规格型号")
     private String ggxh;
 
     /**
      * 计量单位
      */
     @TableField(value = "measureUnit")
-    @ApiModelProperty(value="计量单位")
+    @ApiModelProperty(value = "计量单位")
     private String measureUnit;
 
     /**
      * 单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码
      */
     @TableField(value = "tagStatus")
-    @ApiModelProperty(value="单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码")
+    @ApiModelProperty(value = "单据明细赋码状态  1:未赋码；2：部分赋码；3：已赋码")
     private Integer tagStatus;
 
     /**
      * 赋码错误信息
      */
     @TableField(value = "tagMsg")
-    @ApiModelProperty(value="赋码错误信息")
+    @ApiModelProperty(value = "赋码错误信息")
     private String tagMsg;
 
     /**
      * 自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足
      */
     @TableField(value = "autoTagStatus")
-    @ApiModelProperty(value="自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足")
+    @ApiModelProperty(value = "自动赋码状态：1：无法自动赋码；2：可以自动赋码；3:可以自动赋码，但是数量不足")
     private Byte autoTagStatus;
 
     /**
      * 备注
      */
     @TableField(value = "remark")
-    @ApiModelProperty(value="备注")
+    @ApiModelProperty(value = "备注")
     private String remark;
 
     /**
      * 创建时间
      */
     @TableField(value = "createTime")
-    @ApiModelProperty(value="创建时间")
+    @ApiModelProperty(value = "创建时间")
     private Date createTime;
 
     /**
      * 更新时间
      */
     @TableField(value = "updateTime")
-    @ApiModelProperty(value="更新时间")
+    @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
     @TableField(value = "remark1")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark1;
 
     @TableField(value = "remark2")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark2;
 
     @TableField(value = "remark3")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark3;
 
     @TableField(value = "remark4")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark4;
 
     @TableField(value = "remark5")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark5;
 
     @TableField(value = "remark6")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark6;
 
     @TableField(value = "remark7")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark7;
 
     @TableField(value = "remark8")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark8;
 
     @TableField(value = "remark9")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark9;
 
     @TableField(value = "remark10")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark10;
 
     @TableField(value = "remark11")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark11;
 
     @TableField(value = "remark12")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark12;
 
     @TableField(value = "remark13")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark13;
 
     @TableField(value = "remark14")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark14;
 
     @TableField(value = "remark15")
-    @ApiModelProperty(value="")
+    @ApiModelProperty(value = "")
     private String remark15;
 
     /**
      * 自动扫码预分配工位存量
      */
     @TableField(value = "autoResCount")
-    @ApiModelProperty(value="自动扫码预分配工位存量")
+    @ApiModelProperty(value = "自动扫码预分配工位存量")
     private Integer autoResCount;
 
     /**
      * 替换码
      */
     @TableField(value = "replaceCode")
-    @ApiModelProperty(value="替换码")
+    @ApiModelProperty(value = "替换码")
     private String replaceCode;
 
-
+    /**
+     * 组套编码/医保编码/术士套包编码
+     */
+    @TableField(value = "checkCode")
+    private String checkCode;
 
     private static final long serialVersionUID = 1L;
 

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

@@ -185,12 +185,12 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         // 产品采购类型
         // 拿到产品采购类型
         // code  purType  查找 io_collect_code_backup 是否存在 不存在 提示 当前码未进入预验收/寄售库
-        if (collectSet.getIsScanCodeCheck()){
+        if (collectSet.getIsScanCodeCheck()) {
-            if (udiRelevanceResponse.getPurType() != 1){
+            if (udiRelevanceResponse.getPurType() != 1) {
                 IoCollectCodeBackup collectCodeBackup = ioCollectCodeBackService.getOne(new LambdaQueryWrapper<IoCollectCodeBackup>()
                         .eq(IoCollectCodeBackup::getCode, code)
-                        .eq(IoCollectCodeBackup::getPurType,udiRelevanceResponse.getPurType()));
+                        .eq(IoCollectCodeBackup::getPurType, udiRelevanceResponse.getPurType()));
-                if (collectCodeBackup == null){
+                if (collectCodeBackup == null) {
                     String PurTypeName = udiRelevanceResponse.getPurType() == 2 ? "预验收" : "寄售";
                     throw new JsonException(500, "当前产品追溯码未进入" + PurTypeName + "库");
                 }
@@ -640,7 +640,18 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
     public IoCollectOrderBiz vailByBatchNo(List<UdiRelevanceResponse> udiRelevanceResponses, List<IoCollectOrderBiz> collectOrderBizs, UdiEntity udiEntity) {
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
-                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) {
+
+
+//                增加医保编码/组套编码等校验
+                if (StrUtil.isNotEmpty(collectOrderBiz.getCheckCode())) {
+
+                    if ((StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))
+                            && (StrUtil.emptyIfNull(collectOrderBiz.getCheckCode()).contains(StrUtil.emptyIfNull(udiRelevanceResponse.getYbbm())))) {
+                        collectOrderBiz.setRelId(udiRelevanceResponse.getId());
+                        return collectOrderBiz;
+                    }
+
+                } else if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId()) && (StrUtil.emptyIfNull(collectOrderBiz.getBatchNo()).equals(StrUtil.emptyIfNull(udiEntity.getBatchNo())))) {
                     return collectOrderBiz;
                 }
             }
@@ -652,7 +663,12 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         List<IoCollectOrderBiz> addList = new ArrayList<>();
         for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
             for (IoCollectOrderBiz collectOrderBiz : collectOrderBizs) {
-                if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId())) {
+                if (StrUtil.isNotEmpty(collectOrderBiz.getCheckCode())) {
+                    if (StrUtil.emptyIfNull(collectOrderBiz.getCheckCode()).contains(StrUtil.emptyIfNull(udiRelevanceResponse.getYbbm()))) {
+                        collectOrderBiz.setRelId(udiRelevanceResponse.getId());
+                        return collectOrderBiz;
+                    }
+                } else if (udiRelevanceResponse.getId().equals(collectOrderBiz.getRelId())) {
                     addList.add(collectOrderBiz);
                 }
             }
@@ -695,11 +711,11 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
         if (ioCollectOrder == null)
             return ResultVOUtils.error(500, "单据不存在");
         //判断
-        if (StrUtil.isNotEmpty(request.getUdiCode())){
+        if (StrUtil.isNotEmpty(request.getUdiCode())) {
             IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
                     .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk())
                     .eq(IoCollectOrderCodeMan::getUdiCode, request.getUdiCode()));
-            if (ioCollectOrderCodeMan == null){
+            if (ioCollectOrderCodeMan == null) {
                 BaseResponse response = new BaseResponse();
                 response.setData(request.getUdiCode());
                 response.setCode(500);
@@ -712,19 +728,19 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
 
             AddEnterCodeResponse addEnterCodeResponse = setAddEnterCodeResponse(udiEntity, udiRelevanceResponse);
             return ResultVOUtils.success(addEnterCodeResponse);
-        }else {
+        } else {
             List<VailCodeResultResponse> vailCodeResultResponses = new ArrayList<>();
-            for (String code : request.getUdiCodeList()){
+            for (String code : request.getUdiCodeList()) {
                 IoCollectOrderCodeMan ioCollectOrderCodeMan = collectOrderCodeManMapper.selectOne(new LambdaQueryWrapper<IoCollectOrderCodeMan>()
                         .eq(IoCollectOrderCodeMan::getOrderIdFk, request.getOrderIdFk())
                         .eq(IoCollectOrderCodeMan::getUdiCode, code));
                 VailCodeResultResponse vailCodeResultResponse = new VailCodeResultResponse();
-                if (ioCollectOrderCodeMan != null){
+                if (ioCollectOrderCodeMan != null) {
                     vailCodeResultResponse.setStatus(1);
                     vailCodeResultResponse.setCode(code);
                     vailCodeResultResponse.setSucMsg("校验成功");
                     vailCodeResultResponses.add(vailCodeResultResponse);
-                }else {
+                } else {
                     vailCodeResultResponse.setStatus(2);
                     vailCodeResultResponse.setCode(code);
                     vailCodeResultResponse.setErrMsg("追溯码不存在");