Merge remote-tracking branch 'origin/master'

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) {

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

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
     }
   },

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<PagerVo<WmsInventoryRecordsVo>> splitRecordInventoryList(@RequestBody PagerQuery<WmsInventoryRecordsQuery> pagerQuery){
 		ResultBean<PagerVo<WmsInventoryRecordsVo>> rb = ResultBean.fireFail();
 		WmsInventoryRecordsQuery params = pagerQuery.getParams();