From 4ada4ee62acf639301a525c3bee8c40394ca81e0 Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Thu, 5 Sep 2024 18:19:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=9C=AA=E5=AF=B9=E7=85=A7?=
 =?UTF-8?q?=E5=8D=95=E6=8D=AE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java  | 18 ++++++++++++------
 .../mipsdl/entity/inout/IoCollectOrder.java    | 11 +++++++++++
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
index 1b6536f..6d59f70 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -1366,9 +1366,7 @@ public class CtqyyClient extends CommonHttpClient {
     public BaseResponse getPrescribes(UdiwmsBasicSkPrescribeRequest udiwmsBasicSkPrescribeRequest) {
         LambdaQueryWrapper<VYpzsPresInfo> wrapper = new LambdaQueryWrapper<>();
         String code = udiwmsBasicSkPrescribeRequest.getCode();
-        if (StrUtil.isNotEmpty(code)) {
-            wrapper.or().eq(VYpzsPresInfo::getSTOOUT_NO, code).or().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code);
-        }
+        wrapper.and(StrUtil.isNotEmpty(code),t -> t.eq(VYpzsPresInfo::getSTOOUT_NO, code).or().eq(VYpzsPresInfo::getPRESCRIBE_NUMBER, code));
         //补充其他查询条件
         IPage<VYpzsPresInfo> page = vYpzsPresInfoMapper
                 .selectPage(new Page<VYpzsPresInfo>(udiwmsBasicSkPrescribeRequest.getPage(), udiwmsBasicSkPrescribeRequest.getLimit()), wrapper);
@@ -1519,11 +1517,14 @@ public class CtqyyClient extends CommonHttpClient {
             List<IoCollectOrder> ioCollectOrders = new ArrayList<>();
             groupedByPrescribeNumber.forEach((key, value) -> {
                 VYpzsPresInfo presInfoEntity = value.get(0);
+                StringBuilder errorMsg = new StringBuilder();
                 IoCollectOrder ioCollectOrder = new IoCollectOrder();
                 ioCollectOrder.setBillNo(presInfoEntity.getPRESCRIBE_NUMBER());
                 ioCollectOrder.setFromType("HIS系统");
                 ioCollectOrder.setFromCorp(presInfoEntity.getSICK_ID());
                 ioCollectOrder.setWorkPlaceCode(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode());
+                ioCollectOrder.setFromCorpName("");
+                ioCollectOrder.setWorkPlaceCode(Long.valueOf(udiwmsBasicSkPrescribeRequest.getWorkPlaceCode()));
                 Date date = DateUtil.parseDate(presInfoEntity.getLAY_TIME());
                 ioCollectOrder.setBillTime(date);
                 ioCollectOrder.setCreateTime(new Date());
@@ -1533,17 +1534,18 @@ public class CtqyyClient extends CommonHttpClient {
                 ioCollectOrder.setSplitStatus(0);
                 ioCollectOrder.setTagStatus(0);
                 List<IoCollectOrderBiz> bizList = new ArrayList<>();
-                value.forEach(entity ->
-                {
+                value.forEach(entity -> {
                     IoCollectOrderBiz collectOrderBiz = new IoCollectOrderBiz();
                     BasicUdirelEntity basicUdirelEntity = basicUdirelDao.selectOne(new LambdaQueryWrapper<BasicUdirelEntity>().eq(BasicUdirelEntity::getMainId, entity.getPHYSIC_CODE()));
                     if (basicUdirelEntity != null) {
                         collectOrderBiz.setRelId(basicUdirelEntity.getId());
+                    }else {
+                        errorMsg.append(entity.getPHYSIC_NAME()).append("字典未对照").append(";");
                     }
                     collectOrderBiz.setThrCode(entity.getPHYSIC_CODE());
                     collectOrderBiz.setCpmctymc(entity.getPHYSIC_NAME());
                     collectOrderBiz.setGgxh(entity.getPACK_SPEC());
-                    collectOrderBiz.setBatchNo("");
+                    collectOrderBiz.setBatchNo(entity.getBATCH_NUMBER());
                     collectOrderBiz.setOrderIdFk(ioCollectOrder.getBillNo());
                     collectOrderBiz.setCount(Integer.parseInt(entity.getLAY_PHYSIC_QUANTITY()));
                     collectOrderBiz.setMeasureUnit(entity.getPHYSIC_UNIT());
@@ -1551,6 +1553,10 @@ public class CtqyyClient extends CommonHttpClient {
                     collectOrderBiz.setUnTagCount(0);
                     bizList.add(collectOrderBiz);
                 });
+                if(StrUtil.isNotBlank(errorMsg)){
+                    ioCollectOrder.setErrorMsg(errorMsg.toString());
+                    ioCollectOrder.setTagStatus(4);
+                }
                 ioCollectOrder.setBizList(bizList);
                 ioCollectOrders.add(ioCollectOrder);
             });
diff --git a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java
index 4fdbace..b760e63 100644
--- a/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java
+++ b/src/main/java/com/glxp/mipsdl/entity/inout/IoCollectOrder.java
@@ -57,6 +57,9 @@ public class IoCollectOrder implements Serializable {
 
 
 
+    @TableField(value = "fromCorpName")
+    private String fromCorpName;
+
     /**
      * 单据时间
      */
@@ -191,6 +194,14 @@ public class IoCollectOrder implements Serializable {
     @TableField(value = "invAlert")
     private Integer invAlert;
 
+
+    /**
+     * 异常信息
+     */
+    @TableField(value = "errorMsg")
+    private String errorMsg;
+
+
     @TableField(exist = false)
     private List<CollectOrderBizResponse> collectOrderBizResponseList;