待校验，等相关修改，

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

@@ -28,10 +28,7 @@ import com.glxp.api.req.basic.BasicEntrustRecRequest;
 import com.glxp.api.req.inout.*;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.PageSimpleResponse;
-import com.glxp.api.res.inout.IoCodeTempResponse;
+import com.glxp.api.res.inout.*;
-import com.glxp.api.res.inout.IoOrderDetailBizResponse;
-import com.glxp.api.res.inout.IoOrderResponse;
-import com.glxp.api.res.inout.PdaBusOrderResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.auth.InvBusUserService;
 import com.glxp.api.service.auth.InvWarehouseService;
@@ -45,6 +42,7 @@ import com.glxp.api.util.IntUtil;
 import com.glxp.api.util.OrderNoTypeBean;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 
@@ -388,6 +386,7 @@ public class IoOrderController extends BaseController {
     //待校验提交,以比对结果提交
     @RepeatSubmit()
     @AuthRuleAnnotation("")
+    @Transactional(rollbackFor = Exception.class)
     @PostMapping("warehouse/inout/codeCheck/submitOrderWeb")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)
     public BaseResponse submitByCheckResult(@RequestBody AddOrderRequest addOrderRequest) {
@@ -398,26 +397,28 @@ public class IoOrderController extends BaseController {
             return tempResponse;
 
         //校验单据是否已完成
-        List<IoCodeTempEntity> codeEntities = codeTempService.findByOrderId(addOrderRequest.getBillNo());
+        List<IoCodeResponse> codeEntities = codeTempService.findJoinByOrderId(addOrderRequest.getBillNo());
         if (CollUtil.isEmpty(codeEntities)) {
             return ResultVOUtils.error(500, "单据还未扫码或和扫码校验存在异常无法提交！");
         }
 
-        List<IoCodeTempEntity> codeTempEntities = getCheckRusultCode(addOrderRequest.getBillNo(), codeEntities);
+        List<IoCodeResponse> codeTempEntities = getCheckRusultCode(addOrderRequest.getBillNo(), codeEntities);
-        for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+        for (IoCodeResponse codeTempEntity : codeTempEntities) {
-            if (codeTempEntity.getCheckStatus() == 2) {
+            if (IntUtil.value(codeTempEntity.getCheckStatus()) == 2) {
                 return ResultVOUtils.error(501, "存在多余条码，请先剔除后重新提交！");
             }
         }
         codeTempService.deleteByBillNo(addOrderRequest.getBillNo());
-        for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+        for (IoCodeResponse codeResponse : codeTempEntities) {
-            if (codeTempEntity.getCheckStatus() == 0) {
+            if (IntUtil.value(codeResponse.getCheckStatus()) == 0) {
+                IoCodeTempEntity codeTempEntity = new IoCodeTempEntity();
+                BeanUtil.copyProperties(codeResponse, codeTempEntity);
                 codeTempService.insert(codeTempEntity);
             }
         }
         orderEntity.setStatus(ORDER_STATUS_CHECK_PROCESS);
         ioAddInoutService.dealProcess(orderEntity);
-        checkInoutService.check(addOrderRequest.getBillNo());
+        checkInoutService.checkRightResult(addOrderRequest.getBillNo());
         return ResultVOUtils.success("提交成功！");
 
     }
@@ -441,9 +442,9 @@ public class IoOrderController extends BaseController {
     @GetMapping("admin/warehouse/inout/findCheckCode")
     public BaseResponse findCheckCode(FilterCodeRequest filterCodeRequest) {
         //校验单据是否已完成
-        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(filterCodeRequest.getOrderId());
+        List<IoCodeResponse> codeTempEntities = codeTempService.findJoinByOrderId(filterCodeRequest.getOrderId());
-        List<IoCodeTempEntity> codeEntities = getCheckRusultCode(filterCodeRequest.getOrderId(), codeTempEntities);
+        List<IoCodeResponse> codeEntities = getCheckRusultCode(filterCodeRequest.getOrderId(), codeTempEntities);
-        PageSimpleResponse<IoCodeTempEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        PageSimpleResponse<IoCodeResponse> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(0l);
         pageSimpleResponse.setList(codeEntities);
         return ResultVOUtils.success(pageSimpleResponse);
@@ -484,26 +485,47 @@ public class IoOrderController extends BaseController {
         return otherCodes;
     }
 
-    public List<IoCodeTempEntity> getCheckRusultCode(String billNo, List<IoCodeTempEntity> codeEntities) {
+    public List<IoCodeResponse> getCheckRusultCode(String billNo, List<IoCodeResponse> codeEntities) {
-        List<IoCodeTempEntity> otherCodes = getOtherCode(billNo, codeEntities);
+        List<IoOrderDetailCodeEntity> orderDetailCodeEntities = orderDetailCodeService.findByOrderId(billNo);
-        for (IoCodeTempEntity codeTempEntity : otherCodes) {
+        List<IoOrderDetailBizEntity> orderDetailBizEntities = orderDetailBizService.findByOrderId(billNo);
-            boolean isTure = false;
+        List<IoOrderCheckResultResponse> orderCheckResultResponses = ioCheckInoutService.combineCheck(orderDetailBizEntities, orderDetailCodeEntities);
-            for (IoCodeTempEntity codeEntity : codeEntities) {
+        if (CollUtil.isNotEmpty(orderCheckResultResponses)) {
-                if (IntUtil.value(codeTempEntity.getId()) != IntUtil.value(codeEntity.getId())) {
+            for (IoOrderCheckResultResponse orderCheckResultResponse : orderCheckResultResponses) {
-                    if (StrUtil.nullToEmpty(codeTempEntity.getBatchNo()).equals(StrUtil.nullToEmpty(codeEntity.getBatchNo()))) {
+                for (IoCodeResponse codeTempEntity : codeEntities) {
-                        codeEntity.setCheckStatus(2);
+                    if (IntUtil.value(codeTempEntity.getRelId()) == IntUtil.value(orderCheckResultResponse.getBindRlFk())
-                        isTure = true;
+                            && (StrUtil.nullToEmpty(codeTempEntity.getBatchNo()).equals(StrUtil.nullToEmpty(orderCheckResultResponse.getBBatchNo()))
+                            || StrUtil.nullToEmpty(codeTempEntity.getBatchNo()).equals(StrUtil.nullToEmpty(orderCheckResultResponse.getSBatchNo())
+                    ))) {
+                        if (orderCheckResultResponse.getCount() < 1) {
+                            codeTempEntity.setCheckStatus(1);
+                        } else if (orderCheckResultResponse.getCount() < orderCheckResultResponse.getScanCount()) {
+                            codeTempEntity.setCheckStatus(2);
                         }
-                } else {
-                    if (IntUtil.value(codeTempEntity.getReCount()) != IntUtil.value(codeEntity.getReCount()) || isTure) {
-                        codeEntity.setCheckStatus(2);
-                        isTure = true;
                     }
                 }
             }
-            if (!isTure)
-                codeTempEntity.setCheckStatus(1);
         }
+
+
+//        List<IoCodeTempEntity> otherCodes = getOtherCode(billNo, codeEntities);
+//        for (IoCodeTempEntity codeTempEntity : otherCodes) {
+//            boolean isTure = false;
+//            for (IoCodeTempEntity codeEntity : codeEntities) {
+//                if (IntUtil.value(codeTempEntity.getId()) != IntUtil.value(codeEntity.getId())) {
+//                    if (StrUtil.nullToEmpty(codeTempEntity.getBatchNo()).equals(StrUtil.nullToEmpty(codeEntity.getBatchNo()))) {
+//                        codeEntity.setCheckStatus(2);
+//                        isTure = true;
+//                    }
+//                } else {
+//                    if (IntUtil.value(codeTempEntity.getReCount()) != IntUtil.value(codeEntity.getReCount()) || isTure) {
+//                        codeEntity.setCheckStatus(2);
+//                        isTure = true;
+//                    }
+//                }
+//            }
+//            if (!isTure)
+//                codeTempEntity.setCheckStatus(1);
+//        }
         return codeEntities;
     }
 

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

@@ -1,8 +1,10 @@
 package com.glxp.api.controller.inout;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
 import com.glxp.api.common.enums.ResultEnum;
@@ -15,15 +17,20 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
+import com.glxp.api.entity.system.CompanyEntity;
 import com.glxp.api.entity.system.SysPdfTemplateRelevanceStatemenEntity;
 import com.glxp.api.entity.system.SystemPDFTemplateEntity;
+import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
 import com.glxp.api.req.inout.FilterOrderRequest;
 import com.glxp.api.req.inout.InspectionPDFTemplateRequest;
+import com.glxp.api.res.inout.CptTraceOrderResponse;
+import com.glxp.api.res.inout.CptTraceResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inout.*;
+import com.glxp.api.service.system.CompanyService;
 import com.glxp.api.service.system.SystemPDFModuleService;
 import com.glxp.api.service.system.SystemPDFTemplateService;
 import com.glxp.api.util.JasperUtils;
@@ -261,5 +268,53 @@ public class IoOrderDetailResultController extends BaseController {
         return ResultVOUtils.success();
     }
 
+    @Resource
+    CompanyService companyService;
+
+    /**
+     * 提供UDI协调调用单据明细
+     */
+    @PostMapping("/udiCpt/inout/trace/search")
+    public BaseResponse cptTraceOrder(@RequestBody CptTraceRequest cptTraceRequest) {
+        if (StrUtil.isEmpty(cptTraceRequest.getBatchNo()) || CollUtil.isEmpty(cptTraceRequest.getDiList())) {
+            return ResultVOUtils.error(500, "参数有误！");
+        }
+        CompanyEntity authCompany = companyService.findCompany();
+        List<CptTraceOrderResponse> cptTraceOrderResponses = orderDetailResultService.cptTrace(cptTraceRequest);
+        List<CptTraceResultResponse> cptTraceResultResponses = new ArrayList<>();
+        if (CollUtil.isNotEmpty(cptTraceOrderResponses)) {
+            for (CptTraceOrderResponse cptTraceOrderResponse : cptTraceOrderResponses) {
+                CptTraceResultResponse cptTraceResultResponse = new CptTraceResultResponse();
+                cptTraceResultResponse.setBillNo(cptTraceOrderResponse.getBillNo());
+                cptTraceResultResponse.setBillDate(DateUtil.formatDate(cptTraceOrderResponse.getCreateTime()));
+                cptTraceResultResponse.setBillType(cptTraceOrderResponse.getBillType());
+                if (cptTraceOrderResponse.getMainAction().equals(ConstantType.TYPE_OUT)) {
+                    if (StrUtil.isNotEmpty(cptTraceOrderResponse.getFromInvCode()))
+                        continue;
+                    cptTraceResultResponse.setInOutType(2);
+                    cptTraceResultResponse.setFromCorp(authCompany.getName());
+                    cptTraceResultResponse.setFromCorpCreditNum(authCompany.getCreditCode());
 
+                    //往来单位为病人
+                    if (cptTraceOrderResponse.getCorpType() == 1 && cptTraceOrderResponse.getOutType() == 1) {
+                        cptTraceResultResponse.setToUserInfo(cptTraceOrderResponse.getFromCorpName());
+                    } else {
+                        cptTraceResultResponse.setToCorp(cptTraceOrderResponse.getFromCorpName());
+                        cptTraceResultResponse.setToCorpCreditNum(cptTraceOrderResponse.getCreditNo());
+                    }
+                } else {
+                    cptTraceResultResponse.setInOutType(1);
+                    cptTraceResultResponse.setFromCorp(cptTraceOrderResponse.getFromCorpName());
+                    cptTraceResultResponse.setFromCorpCreditNum(cptTraceOrderResponse.getCreditNo());
+                    cptTraceResultResponse.setToCorp(authCompany.getName());
+                    cptTraceResultResponse.setToCorpCreditNum(authCompany.getCreditCode());
+                }
+
+                cptTraceResultResponses.add(cptTraceResultResponse);
+            }
+        }
+
+        return ResultVOUtils.success(cptTraceResultResponses);
+
+    }
 }

src/main/java/com/glxp/api/dao/inout/IoCodeDao.java

@@ -24,4 +24,7 @@ public interface IoCodeDao extends BaseMapperPlus<IoCodeDao, IoCodeEntity, IoCod
      * @return
      */
     List<IoCodeResponse> filterList(FilterCodeRequest filterCodeRequest);
+
+    List<IoCodeResponse> filterJoinProduct(FilterCodeRequest filterCodeRequest);
+
 }

src/main/java/com/glxp/api/dao/inout/IoCodeTempDao.java

@@ -3,6 +3,7 @@ package com.glxp.api.dao.inout;
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 
 import java.util.List;
@@ -18,4 +19,6 @@ public interface IoCodeTempDao extends BaseMapperPlus<IoCodeTempDao, IoCodeTempE
     List<IoCodeTempResponse> selectCodeList(FilterCodeRequest filterCodeRequest);
 
     Integer selectExitCount(FilterCodeRequest filterCodeRequest);
+
+    List<IoCodeResponse> filterJoinProduct(FilterCodeRequest filterCodeRequest);
 }

src/main/java/com/glxp/api/dao/inout/IoOrderDetailResultDao.java

@@ -2,7 +2,9 @@ package com.glxp.api.dao.inout;
 
 import com.glxp.api.dao.BaseMapperPlus;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.CptTraceOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import io.lettuce.core.dynamic.annotation.Param;
 
@@ -32,4 +34,6 @@ public interface IoOrderDetailResultDao extends BaseMapperPlus<IoOrderDetailBizD
      * @return
      */
     List<IoOrderDetailResultEntity> selectStatDataByTime(@Param("list") List<String> orderIdFk);
+
+    List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
 }

src/main/java/com/glxp/api/req/inout/CptTraceRequest.java

@@ -0,0 +1,89 @@
+package com.glxp.api.req.inout;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 客户端查询任务列表实体类
+ */
+@Data
+public class CptTraceRequest {
+
+
+    /**
+     * 按UDI码查询出入库信息
+     */
+    private String udiCode;
+
+    /**
+     * 查询记录表ID外键
+     */
+    private Long produdctRecordIdFk;
+
+    /**
+     * 任务类型   1：关联关系；2：入库；3：出库
+     */
+    private Integer taskType;
+
+    /**
+     * DI标识列表，多级包装会有多个DI
+     * DI标识数组，逗号隔开
+     */
+    private List<String> diList;
+
+    /**
+     * 企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 医疗器械注册人
+     */
+    private String ylqxzcrbarmc;
+
+    /**
+     * 医疗器械注册人统一社会信用号
+     */
+    private String creditNum;
+
+    /**
+     * 产品名称
+     */
+    private String cpmctymc;
+
+    /**
+     * 规格型号
+     */
+    private String ggxh;
+
+    /**
+     * 批次号
+     */
+    private String batchNo;
+    /**
+     * 生成日期
+     */
+    private String produceDate;
+    /**
+     * 失效日期
+     */
+    private String expireDate;
+
+    /**
+     * 序列号
+     */
+    private String serialNo;
+
+    /**
+     * 任务创建时间
+     */
+    private Date createTime;
+    /**
+     * 任务更新时间
+     */
+    private Date updateTime;
+
+
+}

src/main/java/com/glxp/api/res/inout/CptTraceOrderResponse.java

@@ -0,0 +1,21 @@
+package com.glxp.api.res.inout;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CptTraceOrderResponse {
+
+    private String billNo;
+    private Date createTime;
+    private String mainAction;
+    private String billType;
+    private String fromCorpName;
+    private String creditNo;
+    private String action;
+    private String fromInvCode;
+    private Integer outType;
+    private Integer corpType;
+    private Integer count;
+}

src/main/java/com/glxp/api/res/inout/CptTraceResultResponse.java

@@ -0,0 +1,146 @@
+package com.glxp.api.res.inout;
+
+import cn.hutool.core.util.StrUtil;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class CptTraceResultResponse {
+
+
+    private Long id;
+
+    /**
+     * 单据号
+     */
+    private String billNo;
+
+    /**
+     * 单据时间
+     */
+    private String billDate;
+
+    /**
+     * 1:入库；2：出库
+     */
+    private Integer inOutType;
+
+    /**
+     * 单据类型
+     */
+    private String billType;
+
+    /**
+     * 发货企业
+     */
+    private String fromCorp;
+
+    /**
+     * 发货企业统一社会信用号
+     */
+    private String fromCorpCreditNum;
+
+    /**
+     * 收货企业
+     */
+    private String toCorp;
+
+    /**
+     * 收货企业统一社会信用号
+     */
+    private String toCorpCreditNum;
+
+    private String toUserInfo;
+
+    /**
+     * 单据创建者
+     */
+    private Long createUser;
+
+    /**
+     * 当前企业信息ID外键
+     */
+    private Long companyIdFk;
+
+    /**
+     * 当前企业名称
+     */
+    private String companyName;
+
+    /**
+     * 当前企业统一社会信用号
+     */
+    private String companyCertNum;
+
+    /**
+     * 客户端类型
+     */
+    private Integer clientType;
+
+    /**
+     * 退货原因（退货时填写）
+     */
+    private String returnReason;
+
+    /**
+     * 销毁原因（销毁时填写）
+     */
+    private String destoryReason;
+
+    /**
+     * 执行销毁人（销毁时填写）
+     */
+    private String excuseUser;
+
+    /**
+     * 执行销毁人证件号（销毁时填写）
+     */
+    private String excuseCode;
+
+    /**
+     * 监督人姓名【销毁出库时填写】
+     */
+    private String superviserUser;
+
+    /**
+     * 监督人证件号【销毁出库时填写】
+     */
+    private String superviserCode;
+
+    /**
+     * 上传着ID
+     */
+    private Long uploadUser;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    //关联信息
+    private String cpmctymc;
+    private String nameCode;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+    private String udiCode;
+    private String zczbhhzbapzbh;
+    private String recordCode;
+    private Integer count;
+
+    public String getToCorp() {
+        if (StrUtil.isEmpty(toCorp))
+            return toUserInfo;
+        return toCorp;
+    }
+
+}

src/main/java/com/glxp/api/res/inout/IoCodeResponse.java

@@ -148,4 +148,11 @@ public class IoCodeResponse {
     private String ylqxzcrbarmc;
     private String zczbhhzbapzbh;
     private String manufactory;
+
+    private Integer checkStatus;
+
+
+    private String mySupId;     //更新供应商
+
+
 }

src/main/java/com/glxp/api/res/inout/IoCodeTempResponse.java

@@ -121,4 +121,28 @@ public class IoCodeTempResponse {
      */
     private String supName;
 
+    /**
+     * 部门名称
+     */
+    private String deptName;
+
+    /**
+     * 仓库名称
+     */
+    private String invName;
+
+    /**
+     * 货位名称
+     */
+    private String warehouseName;
+
+    private String productName;
+    private String ggxh;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String manufactory;
+
+    private Integer checkStatus;
+
+
 }

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -220,6 +220,27 @@ public class IoCheckInoutService {
         checkThird(orderEntity);
     }
 
+
+    public void checkRightResult(String orderId) {
+        IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
+        orderDetailCodeService.deleteByOrderId(orderId);
+        List<IoCodeTempEntity> codeTempEntities = codeTempService.findByOrderId(orderEntity.getBillNo());
+        for (IoCodeTempEntity codeTempEntity : codeTempEntities) {
+            IoCodeEntity codeEnttity = new IoCodeEntity();
+            BeanUtils.copyProperties(codeTempEntity, codeEnttity);
+            codeEnttity.setId(null);
+            codeService.insert(codeEnttity);
+            addInoutService.genOrderDetailCode(orderEntity, codeTempEntity);
+        }
+        codeTempService.deleteByBillNo(orderEntity.getBillNo());
+        orderEntity.setStatus(ConstantStatus.ORDER_STATUS_CHECK_SUCCESS);
+        orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_POST);
+        orderEntity.setUpdateTime(new Date());
+        orderService.update(orderEntity);
+        genLostCode(orderEntity.getBillNo());
+        checkThird(orderEntity);
+    }
+
     @Resource
     IoCodeLostService codeLostService;
 

src/main/java/com/glxp/api/service/inout/IoCodeService.java

@@ -15,6 +15,8 @@ public interface IoCodeService {
 
     List<IoCodeEntity> findByOrderId(String billNo);
 
+    List<IoCodeResponse> findJoinByOrderId(String billNo);
+
     int updateById(IoCodeEntity codeEnttity);
 
     int deleteById(Integer id);

src/main/java/com/glxp/api/service/inout/IoCodeTempService.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.util.page.TableDataInfo;
 
@@ -27,6 +28,8 @@ public interface IoCodeTempService {
 
     List<IoCodeTempEntity> findByOrderId(String billNo);
 
+    List<IoCodeResponse> findJoinByOrderId(String billNo);
+
     TableDataInfo<IoCodeTempEntity> findByOrderId(FilterCodeRequest filterCodeRequest);
 
     int deleteByBillNo(String orderId);

src/main/java/com/glxp/api/service/inout/IoOrderDetailResultService.java

@@ -2,7 +2,9 @@ package com.glxp.api.service.inout;
 
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.CptTraceOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 
 import java.util.List;
@@ -24,4 +26,6 @@ public interface IoOrderDetailResultService {
 
     List<IoOrderDetailResultResponse> filterOrderList(FilterOrderDetailResultRequest orderDetailResultRequest);
 
+
+    List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest);
 }

src/main/java/com/glxp/api/service/inout/impl/IoCodeServiceImpl.java

@@ -52,6 +52,15 @@ public class IoCodeServiceImpl implements IoCodeService {
         return ioCodeDao.selectList(new QueryWrapper<IoCodeEntity>().eq("orderId", billNo));
     }
 
+    @Override
+    public List<IoCodeResponse> findJoinByOrderId(String billNo) {
+        if (StrUtil.isEmpty(billNo))
+            return null;
+        FilterCodeRequest filterCodeRequest = new FilterCodeRequest();
+        filterCodeRequest.setOrderId(billNo);
+        return ioCodeDao.filterJoinProduct(filterCodeRequest);
+    }
+
     @Override
     public int updateById(IoCodeEntity codeEnttity) {
         return ioCodeDao.updateById(codeEnttity);

src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java

@@ -1,5 +1,6 @@
 package com.glxp.api.service.inout.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.pagehelper.PageHelper;
@@ -7,6 +8,7 @@ import com.glxp.api.dao.inout.IoCodeTempDao;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.req.inout.FilterCodeRequest;
+import com.glxp.api.res.inout.IoCodeResponse;
 import com.glxp.api.res.inout.IoCodeTempResponse;
 import com.glxp.api.service.inout.IoCodeTempService;
 import com.glxp.api.util.BeanCopyUtils;
@@ -51,6 +53,15 @@ public class IoCodeTempServiceImpl implements IoCodeTempService {
         return ioCodeTempDao.selectList(new QueryWrapper<IoCodeTempEntity>().eq("orderId", billNo));
     }
 
+    @Override
+    public List<IoCodeResponse> findJoinByOrderId(String billNo) {
+        if (StrUtil.isEmpty(billNo))
+            return null;
+        FilterCodeRequest filterCodeRequest = new FilterCodeRequest();
+        filterCodeRequest.setOrderId(billNo);
+        return ioCodeTempDao.filterJoinProduct(filterCodeRequest);
+    }
+
     @Override
     public int updateById(IoCodeTempEntity codeEnttity) {
         return ioCodeTempDao.updateById(codeEnttity);

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailResultServiceImpl.java

@@ -6,7 +6,9 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.dao.inout.IoOrderDetailResultDao;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderDetailResultEntity;
+import com.glxp.api.req.inout.CptTraceRequest;
 import com.glxp.api.req.inout.FilterOrderDetailResultRequest;
+import com.glxp.api.res.inout.CptTraceOrderResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.service.inout.IoOrderDetailResultService;
 import org.springframework.stereotype.Service;
@@ -72,4 +74,10 @@ public class IoOrderDetailResultServiceImpl implements IoOrderDetailResultServic
         return orderDetailResultDao.filterOrderList(orderDetailResultRequest);
     }
 
+    @Override
+    public List<CptTraceOrderResponse> cptTrace(CptTraceRequest cptTraceRequest) {
+        return orderDetailResultDao.cptTrace(cptTraceRequest);
+    }
+
+
 }

src/main/java/com/glxp/api/service/inout/impl/IoOrderServiceImpl.java

@@ -444,8 +444,8 @@ public class IoOrderServiceImpl implements IoOrderService {
     public boolean rollUnCheckOrder(String billNo) {
         IoOrderEntity orderEntity = findByBillNo(billNo);
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_CHECK) {
-            List<IoCodeEntity> codeEntityList = codeService.findByOrderId(billNo);
             codeTempService.deleteByBillNo(billNo);
+            ioOrderDetailCodeService.deleteByOrderId(billNo);
             orderEntity.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
             orderEntity.setDealStatus(ConstantStatus.ORDER_DEAL_DRAFT);
             orderEntity.setUpdateTime(new Date());

src/main/java/com/glxp/api/util/udi/UdiInfoUtil.java

@@ -28,6 +28,9 @@ public class UdiInfoUtil {
         if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhsxrq()) && "否".equals(udiProductEntity.getScbssfbhsxrq())) {
             udiProductEntity.setAllowNoExpire(true);
         }
+        if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) {
+            udiProductEntity.setAllowNoExpire(true);
+        }
         return udiProductEntity;
     }
 
@@ -47,6 +50,9 @@ public class UdiInfoUtil {
                 if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhsxrq()) && "否".equals(udiProductEntity.getScbssfbhsxrq())) {
                     udiProductEntity.setAllowNoExpire(true);
                 }
+                if (StrUtil.isNotEmpty(udiProductEntity.getScbssfbhxlh()) && "否".equals(udiProductEntity.getScbssfbhxlh())) {
+                    udiProductEntity.setAllowNoExpire(true);
+                }
                 //名字转拼音
                 if (StrUtil.isNotBlank(udiProductEntity.getCpmctymc())) {
                     try {

src/main/resources/mybatis/mapper/inout/IoCodeDao.xml

@@ -51,7 +51,10 @@
     <select id="filterList" resultType="com.glxp.api.res.inout.IoCodeResponse">
         select ic.*,
                bp.cpmctymc     productName,
-        bp.ggxh,bp.ylqxzcrbarmc,bp.zczbhhzbapzbh,bp.manufactory,
+               bp.ggxh,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
                ad.name         deptName,
                aw.name         invName,
                auth_space.name warehouseName,
@@ -107,4 +110,22 @@
         </where>
         group by ic.id
     </select>
+
+
+    <select id="filterJoinProduct" resultType="com.glxp.api.res.inout.IoCodeResponse">
+        select ic.*,
+               bp.cpmctymc productName,
+               bp.ggxh,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               bp.manufactory
+        from io_code ic
+                     left join basic_products bp on bp.nameCode = ic.nameCode
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND ic.orderId = #{orderId}
+            </if>
+        </where>
+        group by ic.id
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoCodeTempDao.xml

@@ -2,9 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.glxp.api.dao.inout.IoCodeTempDao">
     <select id="selectCodeList" resultType="com.glxp.api.res.inout.IoCodeTempResponse">
-        select *,
+        select ic.*,
-               (select `name` from basic_corp where erpId = io_code_temp.supId) supName
+               bp.cpmctymc productName,
-        from io_code_temp
+               bp.ggxh,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               bc.name     supName
+        from io_code_temp ic
+                     left join basic_products bp on bp.nameCode = ic.nameCode
+                     left join basic_corp bc on ic.supId = bc.erpId
         <where>
             <if test="orderId != null and orderId != ''">
                 orderId = #{orderId}
@@ -33,4 +40,24 @@
             </if>
         </where>
     </select>
+
+
+    <select id="filterJoinProduct" resultType="com.glxp.api.res.inout.IoCodeResponse">
+        select ic.*,
+               bp.cpmctymc productName,
+               bp.ggxh,
+               bp.ylqxzcrbarmc,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               bc.name     supName
+        from io_code_temp ic
+                     left join basic_products bp on bp.nameCode = ic.nameCode
+                     left join basic_corp bc on ic.supId = bc.erpId
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND ic.orderId = #{orderId}
+            </if>
+        </where>
+        group by ic.id
+    </select>
 </mapper>

src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml

@@ -108,4 +108,35 @@
             </if>
         </where>
     </select>
+
+
+    <select id="cptTrace" parameterType="com.glxp.api.req.inout.CptTraceRequest"
+            resultType="com.glxp.api.res.inout.CptTraceOrderResponse">
+        select io.billNo,
+               io.createTime,
+               io.mainAction,
+               bbt.`name`        billType,
+               basic_corp.`name` fromCorpName,
+               basic_corp.creditNo,
+               basic_corp.outType,
+               basic_corp.corpType,
+               io.action,
+               io.fromInvCode
+        from io_order_detail_result iodr
+                     INNER JOIN io_order io on iodr.orderIdFk = io.billNo
+                     inner join basic_corp on io.fromCorp = basic_corp.erpId
+                     INNER JOIN basic_bussiness_type bbt on io.action = bbt.action
+        <where>
+            and bbt.inStock = true
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="diList != null and diList.size() != 0">
+                AND iodr.`nameCode` in
+                <foreach collection="diList" index="index" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -500,6 +500,7 @@ CALL Pro_Temp_ColumnWork('inv_place_order_detail', 'topInvSpaceCode', 'varchar(2
 
 
 call Modify_index('basic_products', 'uuid', 'idx_uuid', 'BTREE');
+call Modify_index('basic_products', 'nameCode', 'idex_nameCode', 'BTREE');
 
 
 CALL Pro_Temp_ColumnWork('basic_products', 'sfwblztlcp', 'varchar(255)', 1);