From 19f638837b0f83c8395bbe662bf2c04a73b9e72d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期日, 19 十一月 2023 18:53:20 +0800
Subject: [PATCH] 质检信息同步修改

---
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java |    7 ++++++-
 src/main/java/com/fzzy/api/view/Api1310.view.xml             |    5 -----
 src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java |    2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/fzzy/api/view/Api1310.view.xml b/src/main/java/com/fzzy/api/view/Api1310.view.xml
index 497fba4..906f00a 100644
--- a/src/main/java/com/fzzy/api/view/Api1310.view.xml
+++ b/src/main/java/com/fzzy/api/view/Api1310.view.xml
@@ -63,11 +63,6 @@
       <PropertyDef name="zblb">
         <Property></Property>
         <Property name="label">鎸囨爣绫诲埆</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;apiTriggerService#trigger&quot;).getResult(&quot;ZBLB&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
       </PropertyDef>
       <PropertyDef name="jyxm">
         <Property></Property>
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
index aae96d8..7d1250d 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1208.java
@@ -117,7 +117,12 @@
                 //绮潈琛屾斂鍖哄垝浠ｇ爜
                 apiData.setLqxzqhdm(api1102.getXzqhdm());
                 //绠＄悊鏂瑰紡-榛樿鐩村偍
-                apiData.setGlfs("01");
+                if (StringUtils.isEmpty(fz40DepotStore.getManageType())) {
+                    apiData.setGlfs("01");
+                } else {
+                    apiData.setGlfs(fz40DepotStore.getManageType());
+                }
+
                 //鏀跺偍鍦扮偣-榛樿搴撳唴
                 apiData.setScdd("1");
                 //鍌ㄧ伯鏂瑰紡
diff --git a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
index fb5929b..0a00a8e 100644
--- a/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
+++ b/src/main/java/com/fzzy/async/fzzy40/impl/Fzzy40Sync1310.java
@@ -105,7 +105,7 @@
                 api1310.setJydw(fz40Quality.getUser());
                 api1310.setJyr(fz40Quality.getUser());
                 api1310.setJyyj(fz40Quality.getStandard());
-                api1310.setZblb("2");
+                api1310.setZblb(fz40Quality.getZblb());
                 //妫�娴嬮」锛屾娴嬪��
                 jyxm = "";
                 jyz = "";

--
Gitblit v1.9.3