@things-factory/operato-wms 4.3.656 → 4.3.660
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/client/pages/components/select-product-popup.js +9 -4
- package/client/pages/inbound/carton-label-popup.js +247 -13
- package/client/pages/order/arrival-notice/arrival-notice-detail.js +140 -22
- package/client/pages/order/arrival-notice/create-arrival-notice.js +272 -29
- package/client/pages/order/arrival-notice/edit-product-popup.js +513 -278
- package/client/pages/order/arrival-notice/proceed-edit-product-popup.js +193 -138
- package/client/pages/order/arrival-notice/view-product-changes-popup.js +199 -137
- package/client/pages/report/inbound-order-details-report.js +2 -2
- package/dist-server/graphql/resolvers/reports/inbound-order-details-report.js +20 -3
- package/dist-server/graphql/resolvers/reports/inbound-order-details-report.js.map +1 -1
- package/package.json +10 -10
- package/server/graphql/resolvers/reports/inbound-order-details-report.ts +20 -3
- package/translations/en.json +4 -0
- package/translations/ko.json +5 -1
- package/translations/ms.json +5 -1
- package/translations/zh.json +5 -1
|
@@ -86,12 +86,29 @@ exports.inboundOrderDetailsReport = {
|
|
|
86
86
|
left join users u1 on u1.id = an.creator_id
|
|
87
87
|
left join purchase_orders po on po.id = an.purchase_order_id
|
|
88
88
|
left join goods_receival_notes grn on grn.arrival_notice_id = an.id
|
|
89
|
-
|
|
89
|
+
inner join order_inventories oi on oi.arrival_notice_id = an.id
|
|
90
90
|
inner join bizplaces b2 on b2.id = an.bizplace_id
|
|
91
91
|
inner join inventories i on i.id = oi.inventory_id
|
|
92
92
|
inner join temp_products p on p.id = oi.product_id
|
|
93
|
-
inner join product_details pd on pd.id = oi.product_detail_id
|
|
94
|
-
inner join
|
|
93
|
+
inner join product_details pd on pd.id = oi.product_detail_id
|
|
94
|
+
inner join (
|
|
95
|
+
select
|
|
96
|
+
distinct on (
|
|
97
|
+
arrival_notice_id, product_detail_id,
|
|
98
|
+
batch_id
|
|
99
|
+
) *
|
|
100
|
+
from
|
|
101
|
+
order_products
|
|
102
|
+
where
|
|
103
|
+
actual_pack_qty is not null
|
|
104
|
+
order by
|
|
105
|
+
arrival_notice_id,
|
|
106
|
+
product_detail_id,
|
|
107
|
+
batch_id,
|
|
108
|
+
created_at
|
|
109
|
+
) op on op.arrival_notice_id = an.id
|
|
110
|
+
and op.product_detail_id = oi.product_detail_id
|
|
111
|
+
and op.batch_id = oi.batch_id
|
|
95
112
|
) src
|
|
96
113
|
where 1=1
|
|
97
114
|
${extraQueryFilters}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"inbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/inbound-order-details-report.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"inbound-order-details-report.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/reports/inbound-order-details-report.ts"],"names":[],"mappings":";;;AACA,yDAAgD;AAChD,uDAAmD;AAEnD,0CAAiD;AAEpC,QAAA,yBAAyB,GAAG;IACvC,KAAK,CAAC,yBAAyB,CAAC,CAAM,EAAE,MAAiB,EAAE,OAAY;QACrE,IAAI;YACF,MAAM,EAAE,EAAE,EAAE,GAA0B,OAAO,CAAC,KAAK,CAAA;YACnD,IAAI,cAAc,GAAG,EAAE,IAAI,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAA;YAC1D,IAAI,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAClE,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACpE,IAAI,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;YAChE,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;YAC9D,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAA;YAC9D,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAC5D,IAAI,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;YAC5D,IAAI,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;YACpE,IAAI,KAAK,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,UAAU,CAAC,CAAA;YAChE,IAAI,gBAAgB,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,IAAI,kBAAkB,CAAC,CAAA;YAEnF,IAAI,UAAU,EAAE;gBACd,MAAM,IAAI,GAAS,MAAM,EAAE,CAAC,aAAa,CAAC,gBAAI,CAAC,CAAC,OAAO,CAAC;oBACtD,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,CAAC,KAAK,EAAE;oBAC/B,SAAS,EAAE,CAAC,WAAW,CAAC;iBACzB,CAAC,CAAA;gBAEF,MAAM,QAAQ,GAAa,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAA;gBAE5C,IAAI,CAAC,QAAQ;oBAAE,MAAM,eAAe,CAAA;gBAEpC,cAAc,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,CAAC,EAAE,EAAE,CAAA;aAC1E;iBAAM;gBACL,cAAc,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,UAAU,CAAC,CAAA;aACvE;YAED,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM;gBAAE,MAAM,eAAe,CAAA;YAElE,MAAM,QAAQ,GAAa,MAAM,EAAE,CAAC,aAAa,CAAC,mBAAQ,CAAC,CAAC,OAAO,CAAC;gBAClE,EAAE,EAAE,cAAc,CAAC,KAAK;aACzB,CAAC,CAAA;YAEF,MAAM,IAAA,wBAAgB,EAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAA;YAE5C,IAAI,iBAAiB,GAAG,EAAE,CAAA;YAC1B,IAAI,KAAK,EAAE;gBACT,iBAAiB,GAAG,GAAG,iBAAiB,sBAAsB,KAAK,CAAC,KAAK,KAAK,CAAA;aAC/E;YACD,IAAI,KAAK,EAAE;gBACT,iBAAiB,GAAG,GAAG,iBAAiB,sBAAsB,KAAK,CAAC,KAAK,KAAK,CAAA;aAC/E;YACD,IAAI,IAAI,EAAE;gBACR,iBAAiB,GAAG,GAAG,iBAAiB,mCAAmC,IAAI,CAAC,KAAK,KAAK,CAAA;aAC3F;YACD,IAAI,IAAI,EAAE;gBACR,iBAAiB,GAAG,GAAG,iBAAiB,iCAAiC,IAAI,CAAC,KAAK,KAAK,CAAA;aACzF;YACD,IAAI,KAAK,EAAE;gBACT,iBAAiB,GAAG,GAAG,iBAAiB,yBAAyB,KAAK,CAAC,KAAK,KAAK,CAAA;aAClF;YACD,IAAI,QAAQ,EAAE;gBACZ,iBAAiB,GAAG,GAAG,iBAAiB,yBAAyB,QAAQ,CAAC,KAAK,KAAK,CAAA;aACrF;YAED,MAAM,EAAE,CAAC,KAAK,CACZ;;;;;;;;;;;;;;;;;;;;;;;;kBAwBU,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC,2CAA2C,CAAC,CAAC,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;cA8B9E,iBAAiB;;;;;;;;UASrB,gBAAgB,CAAC,KAAK;gBACpB,CAAC,CAAC,gGAAgG;gBAClG,CAAC,CAAC,gCACN;;OAED,EACC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CACrE,CAAA;YAED,MAAM,KAAK,GAAQ,MAAM,EAAE,CAAC,KAAK,CAAC;;OAEjC,CAAC,CAAA;YAEF,MAAM,MAAM,GAAQ,MAAM,EAAE,CAAC,KAAK,CAChC;;;;;;;OAOD,EACC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAClF,CAAA;YAED,IAAI,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAC3B,IAAI,IAAI,GAAG;oBACT,QAAQ,EAAE;wBACR,WAAW,EAAE,GAAG,CAAC,oBAAoB;wBACrC,IAAI,EAAE,GAAG,CAAC,aAAa;qBACxB;oBACD,KAAK,EAAE,GAAG,CAAC,MAAM;oBACjB,KAAK,EAAE,GAAG,CAAC,MAAM;oBACjB,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,MAAM,EAAE,GAAG,CAAC,QAAQ;oBACpB,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,aAAa,EAAE,GAAG,CAAC,cAAc;oBACjC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,cAAc,EAAE,GAAG,CAAC,eAAe;oBACnC,YAAY,EAAE,GAAG,CAAC,aAAa;oBAC/B,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,aAAa,EAAE,GAAG,CAAC,eAAe;oBAClC,OAAO,EAAE;wBACP,EAAE,EAAE,GAAG,CAAC,UAAU;wBAClB,GAAG,EAAE,GAAG,CAAC,WAAW;wBACpB,IAAI,EAAE,GAAG,CAAC,YAAY;wBACtB,WAAW,EAAE,GAAG,CAAC,mBAAmB;wBACpC,IAAI,EAAE,GAAG,CAAC,YAAY;qBACvB;oBACD,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,eAAe,EAAE,GAAG,CAAC,mBAAmB;oBACxC,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,aAAa,EAAE,GAAG,CAAC,eAAe;oBAClC,kBAAkB,EAAE,GAAG,CAAC,qBAAqB;oBAC7C,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,WAAW,EAAE,GAAG,CAAC,YAAY;oBAC7B,cAAc,EAAE,GAAG,CAAC,gBAAgB;oBACpC,mBAAmB,EAAE,GAAG,CAAC,sBAAsB;oBAC/C,eAAe,EAAE,GAAG,CAAC,iBAAiB;oBACtC,oBAAoB,EAAE,GAAG,CAAC,uBAAuB;oBACjD,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,QAAQ,EAAE,GAAG,CAAC,SAAS;oBACvB,OAAO,EAAE,GAAG,CAAC,QAAQ;oBACrB,UAAU,EAAE,GAAG,CAAC,YAAY;oBAC5B,cAAc,EAAE,GAAG,CAAC,eAAe;oBACnC,eAAe,EAAE,GAAG,CAAC,gBAAgB;oBACrC,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,UAAU,EAAE,GAAG,CAAC,WAAW;oBAC3B,SAAS,EAAE,GAAG,CAAC,UAAU;oBACzB,SAAS,EAAE,GAAG,CAAC,UAAU;iBAC1B,CAAA;gBAED,IAAI,GAAG,CAAC,WAAW,EAAE;oBACnB,IAAI,CAAC,UAAU,CAAC,GAAG;wBACjB,EAAE,EAAE,GAAG,CAAC,WAAW;wBACnB,IAAI,EAAE,GAAG,CAAC,aAAa;qBACxB,CAAA;iBACF;gBAED,OAAO,IAAI,CAAA;YACb,CAAC,CAAC,CAAA;YAEF,OAAO;gBACL,KAAK;gBACL,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;aACtB,CAAA;SACF;QAAC,OAAO,KAAK,EAAE;YACd,MAAM,KAAK,CAAA;SACZ;IACH,CAAC;CACF,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-wms",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.660",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@things-factory/attachment-ui": "^4.3.591",
|
|
67
67
|
"@things-factory/auth-ui": "^4.3.591",
|
|
68
68
|
"@things-factory/barcode-ui": "^4.3.612",
|
|
69
|
-
"@things-factory/biz-ui": "^4.3.
|
|
69
|
+
"@things-factory/biz-ui": "^4.3.660",
|
|
70
70
|
"@things-factory/board-service": "^4.3.591",
|
|
71
71
|
"@things-factory/board-ui": "^4.3.642",
|
|
72
72
|
"@things-factory/code-ui": "^4.3.642",
|
|
@@ -81,17 +81,17 @@
|
|
|
81
81
|
"@things-factory/help": "^4.3.591",
|
|
82
82
|
"@things-factory/i18n-base": "^4.3.591",
|
|
83
83
|
"@things-factory/id-rule-base": "^4.3.642",
|
|
84
|
-
"@things-factory/import-ui": "^4.3.
|
|
85
|
-
"@things-factory/import-ui-excel": "^4.3.
|
|
84
|
+
"@things-factory/import-ui": "^4.3.660",
|
|
85
|
+
"@things-factory/import-ui-excel": "^4.3.660",
|
|
86
86
|
"@things-factory/menu-ui": "^4.3.642",
|
|
87
87
|
"@things-factory/more-ui": "^4.3.591",
|
|
88
88
|
"@things-factory/notification": "^4.3.609",
|
|
89
89
|
"@things-factory/pdf": "^4.3.591",
|
|
90
90
|
"@things-factory/print-proxy-service": "^4.3.591",
|
|
91
91
|
"@things-factory/print-ui": "^4.3.591",
|
|
92
|
-
"@things-factory/product-base": "^4.3.
|
|
93
|
-
"@things-factory/resource-ui": "^4.3.
|
|
94
|
-
"@things-factory/sales-ui": "^4.3.
|
|
92
|
+
"@things-factory/product-base": "^4.3.660",
|
|
93
|
+
"@things-factory/resource-ui": "^4.3.660",
|
|
94
|
+
"@things-factory/sales-ui": "^4.3.660",
|
|
95
95
|
"@things-factory/scene-data-transform": "^4.3.591",
|
|
96
96
|
"@things-factory/scene-excel": "^4.3.591",
|
|
97
97
|
"@things-factory/scene-firebase": "^4.3.591",
|
|
@@ -107,8 +107,8 @@
|
|
|
107
107
|
"@things-factory/system-ui": "^4.3.591",
|
|
108
108
|
"@things-factory/transport-base": "^4.3.631",
|
|
109
109
|
"@things-factory/tutorial-ui": "^4.3.591",
|
|
110
|
-
"@things-factory/warehouse-base": "^4.3.
|
|
111
|
-
"@things-factory/worksheet-base": "^4.3.
|
|
110
|
+
"@things-factory/warehouse-base": "^4.3.660",
|
|
111
|
+
"@things-factory/worksheet-base": "^4.3.660"
|
|
112
112
|
},
|
|
113
113
|
"devDependencies": {
|
|
114
114
|
"@things-factory/builder": "^4.3.591",
|
|
@@ -117,5 +117,5 @@
|
|
|
117
117
|
"cypress-localstorage-commands": "^1.6.1",
|
|
118
118
|
"eslint-plugin-cypress": "^2.12.1"
|
|
119
119
|
},
|
|
120
|
-
"gitHead": "
|
|
120
|
+
"gitHead": "d5c870cd06b2fcacea68ba21baadd244e4532b99"
|
|
121
121
|
}
|
|
@@ -93,12 +93,29 @@ export const inboundOrderDetailsReport = {
|
|
|
93
93
|
left join users u1 on u1.id = an.creator_id
|
|
94
94
|
left join purchase_orders po on po.id = an.purchase_order_id
|
|
95
95
|
left join goods_receival_notes grn on grn.arrival_notice_id = an.id
|
|
96
|
-
|
|
96
|
+
inner join order_inventories oi on oi.arrival_notice_id = an.id
|
|
97
97
|
inner join bizplaces b2 on b2.id = an.bizplace_id
|
|
98
98
|
inner join inventories i on i.id = oi.inventory_id
|
|
99
99
|
inner join temp_products p on p.id = oi.product_id
|
|
100
|
-
inner join product_details pd on pd.id = oi.product_detail_id
|
|
101
|
-
inner join
|
|
100
|
+
inner join product_details pd on pd.id = oi.product_detail_id
|
|
101
|
+
inner join (
|
|
102
|
+
select
|
|
103
|
+
distinct on (
|
|
104
|
+
arrival_notice_id, product_detail_id,
|
|
105
|
+
batch_id
|
|
106
|
+
) *
|
|
107
|
+
from
|
|
108
|
+
order_products
|
|
109
|
+
where
|
|
110
|
+
actual_pack_qty is not null
|
|
111
|
+
order by
|
|
112
|
+
arrival_notice_id,
|
|
113
|
+
product_detail_id,
|
|
114
|
+
batch_id,
|
|
115
|
+
created_at
|
|
116
|
+
) op on op.arrival_notice_id = an.id
|
|
117
|
+
and op.product_detail_id = oi.product_detail_id
|
|
118
|
+
and op.batch_id = oi.batch_id
|
|
102
119
|
) src
|
|
103
120
|
where 1=1
|
|
104
121
|
${extraQueryFilters}
|
package/translations/en.json
CHANGED
|
@@ -176,6 +176,9 @@
|
|
|
176
176
|
"field.adjusted_vas_qty": "adjusted vas qty",
|
|
177
177
|
"field.adjusted_vas_remark": "adjusted vas remark",
|
|
178
178
|
"field.adjusted_volume": "adjusted volume",
|
|
179
|
+
"field.adjusted_exp_date": "adjusted exp date",
|
|
180
|
+
"field.adjusted_warehouse": "adjusted warehouse",
|
|
181
|
+
"field.adjusted_location": "adjusted location",
|
|
179
182
|
"field.adjustment_code": "adjustment code",
|
|
180
183
|
"field.adjustment_note": "adjustment note",
|
|
181
184
|
"field.after": "after",
|
|
@@ -426,6 +429,7 @@
|
|
|
426
429
|
"field.loading_end": "loading end",
|
|
427
430
|
"field.loading_start": "loading start",
|
|
428
431
|
"field.location": "location",
|
|
432
|
+
"field.location_name": "location name",
|
|
429
433
|
"field.location_list": "location list",
|
|
430
434
|
"field.location_type": "location type",
|
|
431
435
|
"field.location_variance": "location variance",
|
package/translations/ko.json
CHANGED
|
@@ -2437,5 +2437,9 @@
|
|
|
2437
2437
|
"field.latest_execution_to_date": "[ko] latest execution to date",
|
|
2438
2438
|
"title.selected_vas": "[ko] selected vas",
|
|
2439
2439
|
"text.please_take_necessary_action_to_prevent_any_potential_issues": "[ko] please take necessary action to prevent any potential issues",
|
|
2440
|
-
"text.please_wait_for_current_process_to_be_completed": "[ko] please wait for current process to be completed"
|
|
2440
|
+
"text.please_wait_for_current_process_to_be_completed": "[ko] please wait for current process to be completed",
|
|
2441
|
+
"field.adjusted_exp_date": "[ko] adjusted exp date",
|
|
2442
|
+
"field.adjusted_warehouse": "[ko] adjusted warehouse",
|
|
2443
|
+
"field.adjusted_location": "[ko] adjusted location",
|
|
2444
|
+
"field.location_name": "[ko] location name"
|
|
2441
2445
|
}
|
package/translations/ms.json
CHANGED
|
@@ -2427,5 +2427,9 @@
|
|
|
2427
2427
|
"title.worksheet_unloading": "pemunggahan lembaran kerja",
|
|
2428
2428
|
"title.worksheet_unloading_return": "lembaran kerja pemunggahan pengembalian",
|
|
2429
2429
|
"title.worksheet_vas": "lembaran kerja VAS",
|
|
2430
|
-
"title.zone_worksheet": "lembaran kerja zon"
|
|
2430
|
+
"title.zone_worksheet": "lembaran kerja zon",
|
|
2431
|
+
"field.adjusted_exp_date": "[ms] adjusted exp date",
|
|
2432
|
+
"field.adjusted_warehouse": "[ms] adjusted warehouse",
|
|
2433
|
+
"field.adjusted_location": "[ms] adjusted location",
|
|
2434
|
+
"field.location_name": "[ms] location name"
|
|
2431
2435
|
}
|
package/translations/zh.json
CHANGED
|
@@ -2464,5 +2464,9 @@
|
|
|
2464
2464
|
"title.worksheet_unloading": "工作表卸货",
|
|
2465
2465
|
"title.worksheet_unloading_return": "工作表卸货退货",
|
|
2466
2466
|
"title.worksheet_vas": "VAS清单",
|
|
2467
|
-
"title.zone_worksheet": "区域工作表"
|
|
2467
|
+
"title.zone_worksheet": "区域工作表",
|
|
2468
|
+
"field.adjusted_exp_date": "[zh] adjusted exp date",
|
|
2469
|
+
"field.adjusted_warehouse": "[zh] adjusted warehouse",
|
|
2470
|
+
"field.adjusted_location": "[zh] adjusted location",
|
|
2471
|
+
"field.location_name": "[zh] location name"
|
|
2468
2472
|
}
|