From 626c348c3f1d28f674e8265616979238d9e581fc Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Thu, 18 Apr 2024 09:58:19 +0800
Subject: [PATCH] =?UTF-8?q?=E9=95=BF=E6=B3=B0=E6=A0=A1=E9=AA=8C=E9=AB=98?=
 =?UTF-8?q?=E5=80=BC=E8=80=97=E6=9D=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/mipsdl/client/ctqyy/CtqyyClient.java | 22 +++++++++----------
 .../entity/basic/BasicUdirelEntity.java       |  8 ++++++-
 2 files changed, 17 insertions(+), 13 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 3953327..b8af1c1 100644
--- a/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
+++ b/src/main/java/com/glxp/mipsdl/client/ctqyy/CtqyyClient.java
@@ -616,14 +616,14 @@ public class CtqyyClient extends CommonHttpClient {
         //提交到第三方系统
         if (thrSystemBusApiEntity.getUrl().equals("saveMasterialInput")) {
 //            //采购入库单据
-//            if (vailHightMaterial(detailBizEntities.get(0))) {
-//                zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
-//                UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
-//                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
-//            } else {
-//                zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
-//                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
-//            }
+            if (vailHightMaterial(detailBizEntities.get(0))) {
+                zaZyRequest.setMsgHeader(getMsgHeader("saveMaterialHight"));
+                UdiwmsPreInOrderRequest udiwmsPreInOrderRequest = submitPreInOrderToThirdSys(zaxzyyOrderRequest, orderEntity);
+                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(udiwmsPreInOrderRequest));
+            } else {
+                zaZyRequest.setMsgHeader(getMsgHeader("saveMasterialInput"));
+                zaZyRequest.setMsgBody(JSONUtil.toJsonStr(zaxzyyOrderRequest));
+            }
             Boolean b = sysParamConfigService.selectByKey("ct_split_groupbuy");
             if (b) {
                 Map<String, List<UdiwmsOrderDetailRequest>> splitMap = items.stream()
@@ -677,10 +677,8 @@ public class CtqyyClient extends CommonHttpClient {
      */
     public boolean vailHightMaterial(IoOrderDetailBizEntity orderDetailBizEntity) {
         BasicUdirelEntity basicUdirel = basicUdirelDao.selectById(orderDetailBizEntity.getBindRlFk());
-        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new QueryWrapper<BasicProductsEntity>().eq("uuid", basicUdirel.getUuid()).last("limit 1"));
-        if (basicProductsEntity != null &&
-                (StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("1101")
-                        || StrUtil.trimToEmpty(basicProductsEntity.getBasicPrductRemak7()).equals("3601"))) {
+//        BasicProductsEntity basicProductsEntity = basicProductsDao.selectOne(new QueryWrapper<BasicProductsEntity>().eq("uuid", basicUdirel.getUuid()).last("limit 1"));
+        if (basicUdirel != null && IntUtil.value(basicUdirel.getHcType()) == 1) {
             return true;
         } else
             return false;
diff --git a/src/main/java/com/glxp/mipsdl/entity/basic/BasicUdirelEntity.java b/src/main/java/com/glxp/mipsdl/entity/basic/BasicUdirelEntity.java
index 8ce3bec..d78dadc 100644
--- a/src/main/java/com/glxp/mipsdl/entity/basic/BasicUdirelEntity.java
+++ b/src/main/java/com/glxp/mipsdl/entity/basic/BasicUdirelEntity.java
@@ -147,4 +147,10 @@ public class BasicUdirelEntity {
     @TableField(value = "remark")
     private String remark;
 
-}
\ No newline at end of file
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    @TableField(value = "hcType")
+    private Integer hcType;
+
+}