From 1e0020ec19c18acffeec76258f65a0e0ed1a3f7a Mon Sep 17 00:00:00 2001
From: wanggang <76527413@qq.com>
Date: Tue, 26 Sep 2023 14:24:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E8=BF=90=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=BB=98=E8=AE=A4=E6=98=BE=E7=A4=BA=E7=9A=84=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wwwroot/models/input/fa-yun.js            | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
index be0f29f1..5675fb68 100644
--- a/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
+++ b/code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/input/fa-yun.js
@@ -363,7 +363,30 @@ export default function (businessType) {
             default: [
               {
                 logic: "and",
-                column: "wmsBillNum",
+                column: "shippingDate",
+                action: "biggerThanOrEqual",
+                value: null,
+                readOnly: true,
+                title: "发货开始",
+              },
+              {
+                logic: "and",
+                column: "shippingDate",
+                action: "smallThan",
+                value: null,
+                readOnly: true,
+                title: "发运结束",
+              },
+              {
+                logic: "and",
+                column: "factoryPartCode",
+                action: "like",
+                value: null,
+                readOnly: true,
+              },
+              {
+                logic: "and",
+                column: "pn",
                 action: "like",
                 value: null,
                 readOnly: true,