Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

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,