From a7747416c5f07f89973fd7eefdd3b80e09b7a72d Mon Sep 17 00:00:00 2001
From: yewj <yewj@123.com>
Date: Sun, 8 Sep 2024 15:43:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E5=8D=95=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E6=89=AB=E7=A0=81=E5=8D=95=E9=97=AE=E9=A2=98=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collect/IoCollectOrderCodeManService.java |  2 +-
 .../collect/IoCollectOrderService.java        | 24 +++++++++++--------
 .../collect/IoCollectOrderBizMapper.xml       |  7 ++++--
 src/main/resources/schemas/schema_v2.4.sql    |  2 --
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
index e058cb146..5a111d068 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderCodeManService.java
@@ -430,7 +430,7 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
                 .payFeeCode(udiRelevanceResponse.getPayFeeCode())
                 .cpmctymc(udiRelevanceResponse.getCpmctymc())
                 .nameCode(udiRelevanceResponse.getNameCode())
-                .ggxh(udiRelevanceResponse.getGgxh())
+                .ggxh(StrUtil.isNotEmpty(udiRelevanceResponse.getGgxh()) ? udiRelevanceResponse.getGgxh() : udiRelevanceResponse.getBzgg())
                 .batchNo(udiEntity.getBatchNo())
                 .productDate(udiEntity.getProduceDate())
                 .expireDate(udiEntity.getExpireDate())
diff --git a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
index 496880533..1a33d9e2e 100644
--- a/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
+++ b/src/main/java/com/glxp/api/service/collect/IoCollectOrderService.java
@@ -420,7 +420,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         .payFeeCode(udiRelevanceResponse.getPayFeeCode())
                         .cpmctymc(bizEntity.getItemName())
                         .nameCode(udiRelevanceResponse.getNameCode())
-                        .ggxh(bizEntity.getGgxh())
                         .batchNo(bizEntity.getBatchNo())
                         .count((int) doubleValue)
                         .measureUnit(bizEntity.getMeasureUnit())
@@ -428,7 +427,6 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                         .unTagCount(bizEntity.getCount()).build();
 
                 if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) {
-                    collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg());
                     collectOrderBiz.setMeasureUnit(udiRelevanceResponse.getPrepnUnit());
                 }
                 collectOrderBizs.add(collectOrderBiz);
@@ -447,22 +445,23 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     /**
      * 单据回填
+     *
      * @param ioCollectOrderList
      * @param addr
      */
     @Transactional(rollbackFor = Exception.class)
-    public void importPrescribe(List<IoCollectOrder> ioCollectOrderList,String addr) {
+    public void importPrescribe(List<IoCollectOrder> ioCollectOrderList, String addr) {
         //下载处方
-        if (CollUtil.isNotEmpty(ioCollectOrderList)){
+        if (CollUtil.isNotEmpty(ioCollectOrderList)) {
             for (IoCollectOrder collectOrder : ioCollectOrderList) {
                 if (collectOrderMapper.exists(new LambdaQueryWrapper<IoCollectOrder>().eq(IoCollectOrder::getBillNo, collectOrder.getBillNo()))) {
                     continue;
                 }
                 SysWorkplaceDocumentEntity sysWorkplaceDocumentEntity = sysWorkplaceDocumentService.findByBusType(addr);
-                if (sysWorkplaceDocumentEntity == null){
+                if (sysWorkplaceDocumentEntity == null) {
                     continue;
                 }
-                if(collectOrder.getWorkPlaceCode() == null){
+                if (collectOrder.getWorkPlaceCode() == null) {
                     //自动分配工位
                     final Long[] defaultWorkplace = {null};
                     List<SysWorkplaceResponse> sysWorkplaces = sysWorkplaceService.getAllByBusType(addr);
@@ -499,16 +498,15 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
                 }
                 this.save(collectOrder);
                 List<IoCollectOrderBiz> bizList = collectOrder.getBizList();
-                if (CollUtil.isNotEmpty(bizList)){
-                    for(IoCollectOrderBiz collectOrderBiz : bizList){
-                        if(collectOrderBiz.getRelId() != null){
+                if (CollUtil.isNotEmpty(bizList)) {
+                    for (IoCollectOrderBiz collectOrderBiz : bizList) {
+                        if (collectOrderBiz.getRelId() != null) {
                             UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(collectOrderBiz.getRelId() + "");
                             if (udiRelevanceResponse != null) {
                                 collectOrderBiz.setYbbm(udiRelevanceResponse.getYbbm());
                                 collectOrderBiz.setPayFeeCode(udiRelevanceResponse.getPayFeeCode());
                                 collectOrderBiz.setNameCode(udiRelevanceResponse.getNameCode());
                                 if (IntUtil.value(udiRelevanceResponse.getProductsType()) == 2) {
-                                    collectOrderBiz.setGgxh(udiRelevanceResponse.getBzgg());
                                     collectOrderBiz.setMeasureUnit(udiRelevanceResponse.getPrepnUnit());
                                 }
                             }
@@ -688,6 +686,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
 
     }
 
+    @Resource
+    UdiRlSupService udiRlSupService;
+
     private IoCodeTempEntity buildCodeEntity(IoCollectOrderCodeMan collectOrderCodeMan, IoOrderEntity orderEntity) {
         IoCodeTempEntity tempEntity = new IoCodeTempEntity();
         tempEntity.setOrderId(orderEntity.getBillNo());
@@ -704,6 +705,9 @@ public class IoCollectOrderService extends ServiceImpl<IoCollectOrderMapper, IoC
         tempEntity.setReCount(collectOrderCodeMan.getScanCount());
         tempEntity.setCreateTime(new Date());
         tempEntity.setUpdateTime(new Date());
+        CompanyProductRelevanceEntity udiRlSupEntity = udiRlSupService.selOneByRlId(tempEntity.getRelId());
+        if (udiRlSupEntity != null)
+            tempEntity.setSupId(udiRlSupEntity.getCustomerId());
         tempEntity.setDeptCode(orderEntity.getDeptCode());
         return tempEntity;
     }
diff --git a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
index 1e8517966..f65a7ce9f 100644
--- a/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/IoCollectOrderBizMapper.xml
@@ -3,7 +3,11 @@
 <mapper namespace="com.glxp.api.dao.collect.IoCollectOrderBizMapper">
     <select id="filterList" parameterType="com.glxp.api.req.collect.CollectOrderBizRequest"
             resultType="com.glxp.api.res.collect.CollectOrderBizResponse">
-        SELECT icob.*, bp.nameCode diCode, bp.zczbhhzbapzbh, bp.manufactory,bp.bzgg
+        SELECT icob.*,
+               bp.nameCode                   diCode,
+               bp.zczbhhzbapzbh,
+               bp.manufactory,
+               bp.bzgg
         FROM io_collect_order_biz icob
                  left join basic_udirel bu on icob.relId = bu.id
                  left join basic_products bp on bu.uuid = bp.uuid
@@ -38,5 +42,4 @@
         SET autoResCount = #{autoResCount}
         WHERE id = #{id}
     </update>
-
 </mapper>
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index af256f8e1..e5e1bd57e 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -4343,8 +4343,6 @@ CALL Pro_Temp_ColumnWork('thr_products', 'prepnSpec',
 
 
 
-
-
 CALL Pro_Temp_ColumnWork('basic_ins_material', 'remark',
                          'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT ''备注''',
                          1);