feat: 部门管理-新增报错 Closes #12537

cy

2023-12-08 25b639f34bd7e80a69cdb5b46b2d082c1590d033

 consum-base/src/main/java/com/consum/base/service/LWarehouseFlowService.java

@@ -1,6 +1,7 @@
package com.consum.base.service;

import com.consum.base.core.WhBusinessEnum;
import com.consum.base.core.type.MixType;
import com.consum.base.core.utils.*;
import com.consum.base.pojo.LWarehouseFlowParam;
import com.consum.base.pojo.query.LWhFormOutputQry;
@@ -296,13 +297,10 @@
            paramts.put("chuKuBusinessFormCode", businessFormCode);
            sqlBaoFei.append(" and tScrapped.BUSINESS_FORM_CODE = :baoFeiBusinessFormCode");
            paramts.put("baoFeiBusinessFormCode", businessFormCode);

            sqlBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
            sqlDepBaoFei.append(" and tDepScrapped.BUSINESS_FORM_CODE = :deptBaoFeiBusinessFormCode");
            paramts.put("deptBaoFeiBusinessFormCode", businessFormCode);
            sqlBaoFei.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
            sqlDepTuiHui.append(" and tBack.BUSINESS_FORM_CODE = :deptBackBusinessFormCode");
            paramts.put("deptBackBusinessFormCode", businessFormCode);


            sqlPanDian.append(" and tInventory.BUSINESS_FORM_CODE = :panDianBusinessFormCode");
            paramts.put("panDianBusinessFormCode", businessFormCode);

@@ -334,7 +332,8 @@
                .append(sqlChuKu)
                .append(sqlBaoFei)
                .append(sqlPanDian)

                .append(sqlDepBaoFei)
                .append(sqlDepTuiHui)
                .append(sqlEnd);

        return selectSplit(sql.toString(), paramts, param.getPageNum(), param.getPageSize(), new MapperUtil());
@@ -452,6 +451,7 @@
            Integer businessType = outAndInDetailVO.getBusinessType();
            String mixType = MixType.getMixType(businessType + "" + thisType);
            outAndInDetailVO.setMixType(mixType);
            outAndInDetailVO.setTotalPrice(CurrencyUtil.convertFenToYuan(outAndInDetailVO.getTotalPrice()));
            result.add(outAndInDetailVO);
        });
        pageUtil.setDatas(result);