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

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();