diff --git a/.gitignore b/.gitignore index a12e0f2e..02428b77 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,15 @@ Desktop.ini # Linux auto files *~ +/bin/test/AccountingActivities.groovy +/bin/test/AssetReservationMultipleThreads.groovy +/bin/test/MantleUslSuite.groovy +/bin/test/OrderProcureToPayBasicFlow.groovy +/bin/test/OrderTenantAccess.groovy +/bin/test/OrderToCashBasicFlow.groovy +/bin/test/OrderToCashTime.groovy +/bin/test/RestApiTests.groovy +/bin/test/ReturnToResponseBasicFlow.groovy +/bin/test/WorkPlanToCashBasicFlow.groovy +/moqui_logs/log/error.log +/moqui_logs/log/moqui.log diff --git a/data/MantleSetupData.xml b/data/MantleSetupData.xml index e219c000..5ba48f71 100644 --- a/data/MantleSetupData.xml +++ b/data/MantleSetupData.xml @@ -58,7 +58,7 @@ along with this software (see the LICENSE.md file). If not, see description="Settlement Term Order Payments - Half on Due Date, Half After Delivery" serviceName="mantle.order.OrderServices.create#OrderPayments50Split"/> @@ -168,11 +168,11 @@ along with this software (see the LICENSE.md file). If not, see + description="新顾客优惠" serviceName="mantle.product.PromotionServices.apply#NewCustomerDiscount"/> + description="以 Z% 的折扣买 X 送 Y" serviceName="mantle.product.PromotionServices.apply#BuyGetDiscount"/> + description="按每件数量固定折扣" serviceName="mantle.product.PromotionServices.apply#FlatDiscount"/> + - + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/ZbaOrganizationDemoData.xml b/data/ZbaOrganizationDemoData.xml index 82d451cb..2477e0ff 100644 --- a/data/ZbaOrganizationDemoData.xml +++ b/data/ZbaOrganizationDemoData.xml @@ -16,23 +16,23 @@ along with this software (see the LICENSE.md file). If not, see - + - + - + - + - + - + - + - + - - + - + - + - + - + - + - + - + - - + - - + - + - + @@ -177,11 +177,11 @@ along with this software (see the LICENSE.md file). If not, see contactMechPurposeId="EmailBilling" fromDate="1265184000000"/> - + - + - + - - + - + - + - - + - + - - @@ -281,7 +281,7 @@ along with this software (see the LICENSE.md file). If not, see contentLocation="component://webroot/screen/webroot/images/LincolnSignature.png"/> - - + - - - --> - - + - - - - - + + - + - + passwordHint="框架名，小写字母" currencyUomId="USD" locale="en_US" emailAddress="joe@public.com"/> @@ -375,7 +375,7 @@ along with this software (see the LICENSE.md file). If not, see - @@ -384,13 +384,13 @@ along with this software (see the LICENSE.md file). If not, see + firstNameOnAccount="乔奇" lastNameOnAccount="公"> - + - + @@ -406,7 +406,7 @@ along with this software (see the LICENSE.md file). If not, see - @@ -416,24 +416,24 @@ along with this software (see the LICENSE.md file). If not, see + firstNameOnAccount="乔" lastNameOnAccount="PUBLIC" companyNameOnAccount="乔氏配送"> - + firstNameOnAccount="乔" lastNameOnAccount="PUBLIC" companyNameOnAccount="乔氏配送"> + - + - + - - + companyNameOnAccount="宋氏供应商"> + diff --git a/data/ZcaProductDemoData.xml b/data/ZcaProductDemoData.xml index c57bc4ca..e5c2a0da 100644 --- a/data/ZcaProductDemoData.xml +++ b/data/ZcaProductDemoData.xml @@ -15,20 +15,20 @@ along with this software (see the LICENSE.md file). If not, see - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -37,21 +37,21 @@ along with this software (see the LICENSE.md file). If not, see - + - - + - + About Us -

Ziziwork Retail takes busy work to the Z! Innovative products since 2010 to make your work and life easier.

+

Ziziwork零售将繁忙的工作带到Z！2010年以来的创新产品，让您的工作和生活更轻松。

]]> @@ -60,12 +60,12 @@ along with this software (see the LICENSE.md file). If not, see - + Contact Us -

Ziziwork Retail is an imaginary demonstration company. To contact us close your eyes and imagine.

+

联系我们

+

Ziziwork零售是一个虚构的示范公司。要联系我们闭上眼睛想象一下。

]]> @@ -75,26 +75,26 @@ along with this software (see the LICENSE.md file). If not, see - + - Ziziwork Retail eCommerce Templates]]> + Ziziwork零售电子商务模板]]> - + - - + - + - Ziziwork Retail eCommerce Templates - Server]]> + Ziziwork零售电商模板 - 服务端]]> @@ -110,14 +110,14 @@ along with this software (see the LICENSE.md file). If not, see - +
-

Built on Moqui Framework

- <#if ec.user.username??>

Logged in as ${ec.user.username}

-

from wiki server content, clear store config to see default

+

基于莫基框架建造

+ <#if ec.user.username??>

登录为${ec.user.username}

+

从维基服务器内容中，清除存储配置以查看默认值

]]> @@ -129,8 +129,8 @@ along with this software (see the LICENSE.md file). If not, see
-

Built on Moqui Framework

-

from wiki client content, clear store config to see default

+

基于莫基框架建造

+

从维基服务器内容中，清除存储配置以查看默认值

]]> @@ -139,9 +139,9 @@ along with this software (see the LICENSE.md file). If not, see - + + ownerPartyId="ORG_ZIZI_RETAIL" facilityName="Ziziwork零售仓库"> @@ -175,22 +175,22 @@ along with this software (see the LICENSE.md file). If not, see + description="测试容器1234" facilityId="ZIRET_WH" locationSeqId="01010101"/> + description="测试容器1235" facilityId="ZIRET_WH" locationSeqId="01010101"/> + description="测试容器2234" facilityId="ZIRET_WH" locationSeqId="01020101"/> + description="测试容器2235" facilityId="ZIRET_WH" locationSeqId="01020201"/> + description="测试托盘P123" facilityId="ZIRET_WH" locationSeqId="01010102"/> + description="测试托盘P199" facilityId="ZIRET_WH" locationSeqId="01010502"/> - - + + + categoryName="首页分类"/> + productCategoryTypeEnumId="PctCatalog" categoryName="浏览根目录"/> + productCategoryTypeEnumId="PctCatalog" categoryName="电商所有产品类别"/> + productCategoryTypeEnumId="PctCatalog" categoryName="促销"/> + productCategoryTypeEnumId="PctCatalog" categoryName="新品"/> + productCategoryTypeEnumId="PctCatalog" categoryName="精选畅销品"/> - + + categoryName="示例分类一" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> + categoryName="示例分类二" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> + categoryName="示例分类三" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> - + + categoryName="演示子组件" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> - + categoryName="演示材料" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> + + categoryName="演示设备" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> - + - + - + - + - + - + + assetClassEnumId="AsClsInventorySub" productName="演示子装配一" description=""> + assetClassEnumId="AsClsInventorySub" productName="演示子装配二" description=""> + assetClassEnumId="AsClsInventoryRaw" productName="演示原料1" description=""> - + + chargeShipping="Y" returnable="Y" productName="演示产品一单元" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> - + - + @@ -364,14 +364,14 @@ along with this software (see the LICENSE.md file). If not, see - + chargeShipping="Y" returnable="Y" productName="演示产品1-1" description="" ownerPartyId="ORG_ZIZI_RETAIL"> + - + - + @@ -384,8 +384,8 @@ along with this software (see the LICENSE.md file). If not, see - - + - + @@ -404,7 +404,7 @@ along with this software (see the LICENSE.md file). If not, see - + - + - + + productName="演示产品1-2" description="" chargeShipping="Y" returnable="Y" ownerPartyId="ORG_ZIZI_RETAIL"/> @@ -433,12 +433,12 @@ along with this software (see the LICENSE.md file). If not, see - + - + + chargeShipping="Y" returnable="Y" productName="演示产品2-1" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> @@ -459,16 +459,16 @@ along with this software (see the LICENSE.md file). If not, see - + - + - + chargeShipping="Y" returnable="Y" productName="演示产品3-1" description="" ownerPartyId="ORG_ZIZI_RETAIL"/> + - + @@ -481,7 +481,7 @@ along with this software (see the LICENSE.md file). If not, see acquireCost="4.00" acquireCostUomId="USD" receivedDate="1265184000000"/> - + - + + chargeShipping="Y" returnable="Y" productName="演示包1" description="" ownerPartyId="ORG_ZIZI_RETAIL"> - - - - + + + chargeShipping="Y" returnable="Y" productName="带有变体的演示" description="" ownerPartyId="ORG_ZIZI_RETAIL"> - + - + + assetClassEnumId="AsClsWhEquip" productName="采摘机器人2000"/> + assetClassEnumId="AsClsMfgEquip" productName="组装机器人4000"> @@ -569,7 +546,7 @@ along with this software (see the LICENSE.md file). If not, see quantityOnHandDiff="1" availableToPromiseDiff="1"/> @@ -579,7 +556,7 @@ along with this software (see the LICENSE.md file). If not, see + assetClassEnumId="AsClsInventoryDig" productName="演示序列化数字资产"> + + + + + + Mantle USL统一REST API响应格式包装服务 + + + Mantle业务数据对象 + + + 操作是否成功 + + + HTTP状态码 + + + 提示消息 + + + 错误信息列表 + + + 相关实体名称 + + + 执行的操作类型 + + + 业务域（parties/orders/products等） + + + + + 标准化的Mantle REST响应 + + + + + + + + + Mantle实体操作响应包装 + + + 实体数据 + + + 实体名称 + + + 操作类型（create/read/update/delete/list） + + + 业务域 + + + + + 标准化的实体响应 + + + + + + + + + Mantle列表响应包装 + + + 实体列表 + + + 总数量 + + + 当前页 + + + 每页大小 + + + 实体名称 + + + 业务域 + + + + + 标准化的列表响应 + + + + + + + + + Mantle错误响应包装 + + + 错误消息 + + + 错误代码 + + + 相关实体名称 + + + 失败的操作 + + + 字段验证错误 + + + + + 标准化的Mantle错误响应 + + + + + + + + + Mantle业务操作响应包装（订单、支付、发货等） + + + 业务数据 + + + 业务域（orders/payments/shipments等） + + + 业务操作 + + + 业务单据ID + + + + + 标准化的业务响应 + + + + + + + + \ No newline at end of file diff --git a/service/mantle/account/InvoiceServices.xml b/service/mantle/account/InvoiceServices.xml index b93ad9dc..328b23db 100644 --- a/service/mantle/account/InvoiceServices.xml +++ b/service/mantle/account/InvoiceServices.xml @@ -1705,7 +1705,7 @@ along with this software (see the LICENSE.md file). If not, see - + Ignored if createSingleItem=true, dual boolean approach for backward compatibility If not specified uses ItemTimeEntry for RaprClient, for RaprVendor use ItemHourlyEarnings for Person Worker and ItemTimeEntry for Organization Worker - + If RaprVendor TimeEntry.vendorInvoiceId is populated and time entries with it populated are excluded, otherwise with default of RaprClient TimeEntry.invoiceId is used. If specified only include time entries from this Party (matches TimeEntry.partyId) diff --git a/service/mantle/ledger/LedgerReportServices.xml b/service/mantle/ledger/LedgerReportServices.xml index 3c09272f..9ff636e7 100644 --- a/service/mantle/ledger/LedgerReportServices.xml +++ b/service/mantle/ledger/LedgerReportServices.xml @@ -746,7 +746,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/service/mantle/ledger/LedgerServices.xml b/service/mantle/ledger/LedgerServices.xml index 746c6c0d..1a7cec7d 100644 --- a/service/mantle/ledger/LedgerServices.xml +++ b/service/mantle/ledger/LedgerServices.xml @@ -49,7 +49,7 @@ along with this software (see the LICENSE.md file). If not, see + glJournalName:('错误日记账： ' + (organization?.organizationName ?: organizationPartyId))]"/> @@ -353,7 +353,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/service/mantle/order/OrderServices.xml b/service/mantle/order/OrderServices.xml index ac4f6041..5df33e1e 100644 --- a/service/mantle/order/OrderServices.xml +++ b/service/mantle/order/OrderServices.xml @@ -2413,7 +2413,7 @@ General Order Placement and eCommerce Usage + currencyUomId:(request.currencyUomId ?: 'CNY'), facilityId:request.facilityId]"/> - + @@ -95,7 +95,7 @@ along with this software (see the LICENSE.md file). If not, see - + @@ -202,7 +202,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/service/mantle/shipment/CarrierServices.xml b/service/mantle/shipment/CarrierServices.xml index 59091b91..8056ee3d 100644 --- a/service/mantle/shipment/CarrierServices.xml +++ b/service/mantle/shipment/CarrierServices.xml @@ -52,7 +52,7 @@ along with this software (see the LICENSE.md file). If not, see - + diff --git a/service/mantle/work/TimeServices.xml b/service/mantle/work/TimeServices.xml index bce19829..49a8744c 100644 --- a/service/mantle/work/TimeServices.xml +++ b/service/mantle/work/TimeServices.xml @@ -744,7 +744,7 @@ along with this software (see the LICENSE.md file). If not, see - +