From bb03d0d23fefe0318d9cb52a5797f5dd4993b132 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 16 Jan 2025 09:06:06 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialrebate/specialrebatecheck/specialrebatecheck.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue index a5896de497..a2a0c4d36d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatecheck.vue @@ -234,6 +234,9 @@ export default { btnHandle(btnKey) { console.log('XXXXXXXXXXXXXXX ' + btnKey) switch (btnKey) { + case 'toRepush': + this.toRepush() + break case 'doDel': this.doDel() break From 8d78bce8889a73d5f56893163edb03843769c288 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 16 Jan 2025 09:17:07 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=A1=8C=E9=94=80=E6=8E=A8=E5=87=AD=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java index f0c3357280..b43adce839 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java @@ -826,7 +826,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign { dto1.setSummary(timeFlag + "行销返利上传"); dto1.setSubjectNo("6401.14"); dto1.setDimensionDept(deptNo); - dto1.setCredit(srlxx.negate().toString()); + dto1.setDebit(srlxx.negate().toString()); resultDetails.add(dto1); } if (dkxxtz.compareTo(BigDecimal.ZERO) != 0) { From dd238a2a39d3f99669610af32404890c71959238 Mon Sep 17 00:00:00 2001 From: fanzongzhe0036 Date: Thu, 16 Jan 2025 10:28:18 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8B=86=E4=BB=B6?= =?UTF-8?q?=E5=BA=93=E5=87=BA=E5=85=A5=E5=BA=93=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java index df6d190d5f..34102a4b60 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRecordRest.java @@ -29,11 +29,8 @@ import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryQuery; -import com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryVoExcelVo; import com.yxt.wms.biz.inventory.wmsinventoryrecord.*; import com.yxt.wms.biz.inventory.wmsinventoryrecord.report.*; -import com.yxt.wms.biz.inventory.wmsoutbill.WmsOutBillVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -157,7 +154,7 @@ public class WmsInventoryRecordRest { return rb.success().setData(pv); } @ApiOperation("拆件库出入库查询") - @PostMapping("/splitRecordInventoryList ") + @PostMapping("/splitRecordInventoryList") ResultBean> splitRecordInventoryList(@RequestBody PagerQuery pagerQuery){ ResultBean> rb = ResultBean.fireFail(); WmsInventoryRecordsQuery params = pagerQuery.getParams(); From 939653e4d8b690c9b4b076caa73f7d836c68347f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 16 Jan 2025 10:36:27 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=93=E9=A1=B9?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E6=A0=B8=E5=AF=B9=20--=20=E5=BE=85=E6=A0=B8?= =?UTF-8?q?=E5=AF=B9=E7=82=B9=E5=87=BB=E4=BF=AE=E6=94=B9=E8=AE=A1=E7=AE=97?= =?UTF-8?q?=E8=BF=94=E5=88=A9=E5=B7=AE=E5=BC=82=E9=87=91=E9=A2=9D=E6=95=B0?= =?UTF-8?q?=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../specialrebatecheck/specialrebatetobecheckedByUpdate.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue index f94b014136..384d25a15e 100644 --- a/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue +++ b/anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue @@ -223,7 +223,7 @@ export default { // 计算差异金额 = 上传返利金额 - (预提返利 - 其中预提费用); 上传返利金额 = 上传金额(一次上传金额 + 二次上传金额) - 待确定金额 - 费用(一次支出费用 + 一次待支付费用 + 一次抵顶费用 + 二次支出费用 + 二次待支付费用 + 二次抵顶费用) computeDiffAmount() { let diffAmount = '0' - diffAmount = Math.round(((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) + parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondItureCost !== '' ? this.formobj.secondItureCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0))) - (parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - (parseFloat(this.formobj.expectTreatCost !== '' ? this.formobj.expectTreatCost : 0) + parseFloat(this.formobj.expectSuppCost !== '' ? this.formobj.expectSuppCost : 0)))) * 100) / 100 + diffAmount = Math.round(((parseFloat(this.formobj.uploadMoney !== '' ? this.formobj.uploadMoney : 0) + parseFloat(this.formobj.secondaryUploadMoney !== '' ? this.formobj.secondaryUploadMoney : 0) - parseFloat(this.formobj.stayDetermineMoney !== '' ? this.formobj.stayDetermineMoney : 0) - (parseFloat(this.formobj.onceItureCost !== '' ? this.formobj.onceItureCost : 0) + parseFloat(this.formobj.onceTreatCost !== '' ? this.formobj.onceTreatCost : 0) + parseFloat(this.formobj.onceSuppCost !== '' ? this.formobj.onceSuppCost : 0) + parseFloat(this.formobj.secondItureCost !== '' ? this.formobj.secondItureCost : 0) + parseFloat(this.formobj.secondTreatCost !== '' ? this.formobj.secondTreatCost : 0) + parseFloat(this.formobj.secondSuppCost !== '' ? this.formobj.secondSuppCost : 0))) - (parseFloat(this.formobj.estimateRebate !== '' ? this.formobj.estimateRebate : 0) - (parseFloat(this.formobj.expectItureCost !== '' ? this.formobj.expectItureCost : 0) + parseFloat(this.formobj.expectTreatCost !== '' ? this.formobj.expectTreatCost : 0) + parseFloat(this.formobj.expectSuppCost !== '' ? this.formobj.expectSuppCost : 0)))) * 100) / 100 return diffAmount } },