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

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/inventory/vmi.js

@@ -1,4 +1,4 @@
-import { billType, codeType, subBillType } from "./inventory.js";
+import { codeType, deliverBillType, deliverSubBillType } from "../_options.js";
 
 export default function () {
   return {
@@ -14,16 +14,16 @@ export default function () {
       //   title: "LU零件号",
       //   type: "string",
       // },
-      partCode: {
+      realPartCode: {
         title: "LU零件号",
         type: "string",
       },
-      customerPartCode: {
+      custPartCode: {
         title: "客户零件号",
         type: "string",
       },
       codeType,
-      billType,
+      deliverBillType,
       qty: {
         title: "数量",
         type: "string",
@@ -33,7 +33,7 @@ export default function () {
         type: "string",
         input: "datetime",
       },
-      deliverTime: {
+      assembleData: {
         title: "订单日期",
         type: "string",
         input: "datetime",
@@ -62,29 +62,25 @@ export default function () {
         title: "PJIS生产顺序号",
         type: "string",
       },
-      reMark: {
-        title: "备注",
+      realCode: {
+        title: "实际生产码",
         type: "string",
       },
       configcode: {
         title: "配置码",
         type: "string",
       },
-      factory: {
-        title: "工厂",
-        type: "string",
-      },
-      subBillType,
-      realCode: {
-        title: "WMS实发生产码",
-        type: "string",
-      },
+      // factory: {
+      //   title: "工厂",
+      //   type: "string",
+      // },
+      // deliverSubBillType,
       vinCode: {
         title: "EDI订单生产码",
         type: "string",
       },
-      settlementVinCode: {
-        title: "结算生产码",
+      reMark: {
+        title: "备注",
         type: "string",
       },
     },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/balance.js

@@ -59,7 +59,7 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "partCode",
+                column: "realPartCode",
                 action: "like",
                 value: null,
                 readOnly: true,
@@ -80,7 +80,7 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "billType",
+                column: "deliverBillType",
                 action: "equal",
                 value: null,
                 readOnly: true,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/log.js

@@ -60,8 +60,8 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "billType",
-                action: "equal",
+                column: "realPartCode",
+                action: "like",
                 value: null,
                 readOnly: true,
               },
@@ -81,8 +81,8 @@ export default function () {
               },
               {
                 logic: "and",
-                column: "partCode",
-                action: "like",
+                column: "deliverBillType",
+                action: "equal",
                 value: null,
                 readOnly: true,
               },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/vmi/vmi.js

@@ -111,14 +111,22 @@ function useLogSchema() {
         title: "变动人",
         type: "string",
       },
-      partCode2: {
-        title: "结算厂内零件号",
+      changedQty: {
+        title: "变动数量",
         type: "string",
       },
+      isReplenished: {
+        type: "boolean",
+        title: "是否补货",
+      },
       settlementVinCode: {
         title: "结算生产码",
         type: "string",
       },
+      settlementPartCode: {
+        title: "结算厂内零件号",
+        type: "string",
+      },
     },
     useSchema()
   );