@things-factory/integration-accounting 4.3.654 → 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.
|
@@ -25,12 +25,12 @@ function createSalesReturn() {
|
|
|
25
25
|
items: orderProducts.map(op => {
|
|
26
26
|
return {
|
|
27
27
|
id: op === null || op === void 0 ? void 0 : op.refItemId,
|
|
28
|
-
unitPrice: op === null || op === void 0 ? void 0 : op.sellingPrice,
|
|
28
|
+
unitPrice: (op === null || op === void 0 ? void 0 : op.sellingPrice) / (op === null || op === void 0 ? void 0 : op.releaseQty) || 0,
|
|
29
29
|
quantity: -(op === null || op === void 0 ? void 0 : op.releaseQty),
|
|
30
30
|
deliveryQuantity: 0,
|
|
31
31
|
discountAmount: 0,
|
|
32
32
|
remark: op === null || op === void 0 ? void 0 : op.remark,
|
|
33
|
-
enterPrice: op === null || op === void 0 ? void 0 : op.sellingPrice,
|
|
33
|
+
enterPrice: (op === null || op === void 0 ? void 0 : op.sellingPrice) || 0,
|
|
34
34
|
discountRemark: '',
|
|
35
35
|
totalDiscountAmount: 0
|
|
36
36
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-sales-return.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-return/create-sales-return.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,oBAAoB;QAC1B,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;;YAC7B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC1C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,MAAM,aAAa,GAAQ,WAAW,CAAC,OAAO,CAAC,MAAM,CACnD,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,cAAc,IAAI,WAAW,CAAC,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,WAAW,CAAC,eAAe,CAC3G,CAAA;YACD,IAAI,IAAI,GAAQ;gBACd,EAAE,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM;gBACvB,QAAQ,EAAE,WAAW,CAAC,SAAS;gBAC/B,IAAI,EAAE,CAAC;gBACP,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa;gBAC5C,MAAM,EAAE;oBACN,EAAE,EAAE,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,QAAQ;iBAC/B;gBACD,WAAW,EAAE,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,UAAU;gBACzC,gBAAgB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM;gBACrC,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW;gBACvC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;oBAC5B,OAAO;wBACL,EAAE,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS;wBACjB,SAAS,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"create-sales-return.js","sourceRoot":"","sources":["../../../../../server/controllers/xilnex/apis/sales-return/create-sales-return.ts"],"names":[],"mappings":";;;AAAA,SAAgB,iBAAiB;IAC/B,OAAO;QACL,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,oBAAoB;QAC1B,WAAW,CAAC,GAAG,EAAE,EAAE,UAAU,EAAE;;YAC7B,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,GAAG,GAAG,CAAA;YAC1C,IAAI,WAAW,GAAQ,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,WAAW,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;YACxF,MAAM,aAAa,GAAQ,WAAW,CAAC,OAAO,CAAC,MAAM,CACnD,MAAM,CAAC,EAAE,CACP,MAAM,CAAC,cAAc,IAAI,WAAW,CAAC,YAAY,IAAI,MAAM,CAAC,aAAa,IAAI,WAAW,CAAC,eAAe,CAC3G,CAAA;YACD,IAAI,IAAI,GAAQ;gBACd,EAAE,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM;gBACvB,QAAQ,EAAE,WAAW,CAAC,SAAS;gBAC/B,IAAI,EAAE,CAAC;gBACP,MAAM,EAAE,WAAW;gBACnB,MAAM,EAAE,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM,KAAI,aAAa;gBAC5C,MAAM,EAAE;oBACN,EAAE,EAAE,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,QAAQ;iBAC/B;gBACD,WAAW,EAAE,MAAA,aAAa,CAAC,CAAC,CAAC,0CAAE,UAAU;gBACzC,gBAAgB,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,MAAM;gBACrC,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,WAAW;gBACvC,KAAK,EAAE,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;oBAC5B,OAAO;wBACL,EAAE,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,SAAS;wBACjB,SAAS,EAAE,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,KAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,UAAU,CAAA,IAAI,CAAC;wBACjD,QAAQ,EAAE,CAAC,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,UAAU,CAAA;wBACzB,gBAAgB,EAAE,CAAC;wBACnB,cAAc,EAAE,CAAC;wBACjB,MAAM,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,MAAM;wBAClB,UAAU,EAAE,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,YAAY,KAAI,CAAC;wBACjC,cAAc,EAAE,EAAE;wBAClB,mBAAmB,EAAE,CAAC;qBACvB,CAAA;gBACH,CAAC,CAAC;aACH,CAAA;YAED,OAAO;gBACL,OAAO,EAAE,EAAE,IAAI,EAAE;aAClB,CAAA;QACH,CAAC;QACD,SAAS,CAAC,GAAG;YACX,OAAO,GAAG,CAAC,IAAI,CAAA;QACjB,CAAC;KACF,CAAA;AACH,CAAC;AA9CD,8CA8CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/integration-accounting",
|
|
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,
|
|
@@ -33,8 +33,8 @@
|
|
|
33
33
|
"@things-factory/i18n-base": "^4.3.591",
|
|
34
34
|
"@things-factory/integration-ui": "^4.3.653",
|
|
35
35
|
"@things-factory/more-ui": "^4.3.591",
|
|
36
|
-
"@things-factory/product-base": "^4.3.
|
|
37
|
-
"@things-factory/resource-ui": "^4.3.
|
|
36
|
+
"@things-factory/product-base": "^4.3.660",
|
|
37
|
+
"@things-factory/resource-ui": "^4.3.660",
|
|
38
38
|
"@things-factory/setting-ui": "^4.3.642",
|
|
39
39
|
"@things-factory/system-ui": "^4.3.591",
|
|
40
40
|
"debug": "^4.1.1",
|
|
@@ -50,5 +50,5 @@
|
|
|
50
50
|
"nock": "^13.0.2",
|
|
51
51
|
"should": "^13.2.3"
|
|
52
52
|
},
|
|
53
|
-
"gitHead": "
|
|
53
|
+
"gitHead": "d5c870cd06b2fcacea68ba21baadd244e4532b99"
|
|
54
54
|
}
|
|
@@ -24,12 +24,12 @@ export function createSalesReturn() {
|
|
|
24
24
|
items: orderProducts.map(op => {
|
|
25
25
|
return {
|
|
26
26
|
id: op?.refItemId,
|
|
27
|
-
unitPrice: op?.sellingPrice,
|
|
27
|
+
unitPrice: op?.sellingPrice / op?.releaseQty || 0,
|
|
28
28
|
quantity: -op?.releaseQty,
|
|
29
29
|
deliveryQuantity: 0,
|
|
30
30
|
discountAmount: 0,
|
|
31
31
|
remark: op?.remark,
|
|
32
|
-
enterPrice: op?.sellingPrice,
|
|
32
|
+
enterPrice: op?.sellingPrice || 0,
|
|
33
33
|
discountRemark: '',
|
|
34
34
|
totalDiscountAmount: 0
|
|
35
35
|
}
|