问题修改

2 years ago · ca12cb0221
12 changed files with 74 additions and 65 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java
@ -21,7 +21,6 @@ import java.util.Map;
        path = "v1/basevehicleout",
        fallback = BaseVehicleOutFeignFallback.class)
 public interface BaseVehicleOutFeign {
-
    @ApiOperation("车辆出库")
    @PostMapping("/vehicleOut")
    @ResponseBody
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/BillTypeEnum.java
@ -13,6 +13,7 @@ public enum BillTypeEnum {
    CLWC("CLWC", "车辆外采"),
    RZSQ("RZSQ", "入账申请"),
    NGSQ("NGSQ", "内购申请"),
+    TZSQ("TZSQ", "调账申请"),
    CJTKSQ("CJTKSQ", "厂家退库申请"),
    FYSQ("FYSQ","费用申请"),
    FKSQ("FKSQ","付款申请"),
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.java
@ -73,4 +73,6 @@ public interface BaseAccadjApplyMapper extends BaseMapper<BaseAccadjApply> {
    int updateFlowFiled(Map<String, Object> map);

    int selectBySid(String join);
+
+    String selectNum(String bill);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyMapper.xml
@ -60,4 +60,12 @@
        WHERE nodeState != '待提交'
 		  and find_in_set(sid, #{list})
    </select>
+
+    <select id="selectNum" resultType="java.lang.String">
+        select RIGHT (applyNo, 4)
+        from base_accadj_apply
+        where applyNo LIKE concat(#{bill}, '%')
+        order by applyNo desc
+                limit 1
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@ -61,8 +61,11 @@ import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
 import com.yxt.anrui.base.biz.basevehiclemodel.BaseVehicleModelService;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
 import com.yxt.anrui.base.common.enums.ManPurOrderType;
 import com.yxt.anrui.base.common.enums.VehicleState;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
@ -215,6 +218,8 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
            dto.setApplyDate(DateUtil.today());
            dto.setNodeState("待提交");
            dto.setOrgSidPath(orgSidPath);
+            String applyNo = getApplyCode(dto.getCallInOrgSid());
+            dto.setApplyNo(applyNo);
            ResultBean resultBean = this.insertByDto(dto);
            String sid = (String) resultBean.getData();
            for (String accSid : accSids) {
@ -241,6 +246,23 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
        return rb.success().setMsg("修改成功").setData(dtoSid);
    }

+    public String getApplyCode(String useOrgSid) {
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(useOrgSid);
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.TZSQ.getBillType());
+        String bill = Rule.getBill(b);
+        String i = baseMapper.selectNum(bill);
+        String billNo = "";
+        if (StringUtils.isNotBlank(i)) {
+            billNo = Rule.getBillNo(bill, Integer.valueOf(i).intValue());
+        } else {
+            billNo = Rule.getBillNo(bill, 0);
+        }
+        return billNo;
+    }
+
    public ResultBean<String> insertByDto(BaseAccadjApplyDto dto) {
        ResultBean rb = ResultBean.fireFail();
        BaseAccadjApply entity = new BaseAccadjApply();
@ -491,9 +513,14 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                        baseAccadjApplyToJDRus.add(baseAccadjApplyToJDRu);
                    }
                    for (BaseAccadjApplyToJDRu baseAccadjApplyToJDRu : baseAccadjApplyToJDRus) {
-                        List<BaseVehicle> baseVehicles = baseAccadjApplyToJDRu.getBaseVehicles();
+                        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles1 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
+                        BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles1.get(0);
+                        //调入取车辆信息
+                        BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle1.getVinNo(), baseAccadjApply.getCallInOrgSid());
+                        //调出取车辆信息
+                        BaseVehicle baseVehicleDC = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle1.getVinNo(), baseAccadjApply.getCallOutOrgSid());
                        //调出采购系统sid(部门sid)
-                        String purchaseSystemSid = baseVehicles.get(0).getPurchaseSystemSid();
+                        String purchaseSystemSid = baseVehicleDC.getPurchaseSystemSid();
                        //调出获取采购系统
                        BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVoDC = basePurchaseSystemService.fetchDetailsByDeptSid(purchaseSystemSid).getData();
                        //调出获取采购系统中的财务分公司编码
@ -502,8 +529,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                        SysOrganization sysOrganizationDC = sysOrganizationFeign.selectByOrgCode(orgCodeDC).getData();
                        //调出获取组织的otherCode
                        String otherCodeDC = sysOrganizationDC.getOtherCode();
-                        //调入取车辆信息
-                        BaseVehicle baseVehicleDR = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicles.get(0).getVinNo(), baseAccadjApply.getCallInOrgSid());
                        //调入采购系统sid(部门sid)
                        String purchaseSystemSidDR = baseVehicleDR.getPurchaseSystemSid();
                        //调入获取采购系统
@ -526,56 +551,58 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                        String callInBuyerOrgSid = baseAccadjApplyToJDRu.getCallInBuyerOrgSid();
                        SysOrganizationVo data = sysOrganizationFeign.fetchBySid(callInBuyerOrgSid).getData();
                        stkInStock.setFPurchaseDeptId(data.getOrgCode());
-                        //stkInStock.setFPurchaseDeptId("05.04");
                        //采购组织:FPurchaseOrgId  (必填项)
                        //分公司id
-                        List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles2 = baseAccadjApplyToJDRu.getBaseInternalPurchaseVehicles();
-                        BaseInternalPurchaseVehicle baseInternalPurchaseVehicle1 = baseInternalPurchaseVehicles2.get(0);
-                        //ResultBean<SysOrganizationVo> sysOrganizationVoResultBean = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCallInOrgSid());
                        stkInStock.setFPurchaseOrgId(orgCodeDR);
                        //分配目标组织:TOrgId  (必填项)
                        stkInStock.setTOrgId(stkInStock.getFPurchaseOrgId());
                        //供应商:FSupplierId  (必填项)
                        stkInStock.setFSupplierId(otherCodeDC);
-                        //stkInStock.setFSupplierId("010001");
                        // 物料列表:FInStockEntry  (必填项)
                        List<StkInStock.FInStockEntry> fInStockEntry = new ArrayList<>();
-                        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
+                        List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
+                        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles1) {
                            StkInStock.FInStockEntry sf = new StkInStock.FInStockEntry();
                            String vinNo = baseInternalPurchaseVehicle.getVinNo();
                            //单价  目前放的是内销价  应该是厂家结算价 目前没有厂家结算价  需要后期修改为厂家结算价
                            sf.setFPrice(baseInternalPurchaseVehicle.getCostPrice() + "");
                            //车辆类型
-                            BaseVehicle baseVehicle2 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
-                            String manufacturerSid = baseVehicle2.getManufacturerSid();
-                            String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicle2.getManufSaleAccessName());
+                            BaseVehicle baseVehicleDRCL = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
+                            String manufacturerSid = baseVehicleDRCL.getManufacturerSid();
+                            String s = baseManufacturerBankService.fetchByMainSidAndManufSaleAccessName(manufacturerSid, baseVehicleDRCL.getManufSaleAccessName());
                            sf.setCllx(s);//TODO
                            //车辆类型
                            sf.setCllxType(s);
-                            //  批号:FLot
+                            //批号:FLot
                            sf.setFLot(baseInternalPurchaseVehicle.getVinNo());
-                            // 物料编码:FMaterialId  (必填项)
+                            //物料编码:FMaterialId  (必填项)
                            sf.setFMaterialId(baseInternalPurchaseVehicle.getVinNo().substring(baseInternalPurchaseVehicle.getVinNo().length() - 8));
-                            //  仓库:FStockId
-                            BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(vinNo, callInOrgSid);
-                            //fe.setFStockID(voResultBean.getData().getGressionCode());
-                            String location = baseVehicle1.getLocation();
+                            //仓库:FStockId
+                            String location = baseVehicleDRCL.getLocation();
                            ScmWarehouseVo data1 = scmWarehouseFeign.fetchBySid(location).getData();
                            sf.setFStockId(data1.getGressionCode());
-                            // fe.setFStockID("CK001");
-                            //fe.setFStockID(baseInternalPurchaseVehicle.getInventoryLocationSid());
                            //物料分组
-                            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.selectByModelSid(baseInternalPurchaseVehicle.getModelSid());
+                            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicleDRCL.getCarBrandSid());
                            if (baseVehicleBrand != null) {
                                sf.setWlfz(baseVehicleBrand.getBrandCode());
-                                // sf.setWlfz("01");
                            }
-                            //物料分组
-                            //sf.setWlfzType("01");
                            //存货类别
-                            sf.setFCategoryIDKey(baseVehicle1.getManPurOrderTypeKey());
+                            sf.setFCategoryIDKey(baseVehicleDRCL.getManPurOrderTypeKey());
                            sf.setFCategoryIDType("purchaseOrderType");
                            fInStockEntry.add(sf);
+                            //构造入库查询车辆
+                            ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
+                            scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo());
+                            scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
+                            scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
+                            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDRCL.getManufSaleAccessKey());
+                            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDRCL.getManufSaleAccessName());
+                            scmApplyInboundVehQueryDto.setIunit("辆");
+                            scmApplyInboundVehQueryDto.setNum("1");
+                            scmApplyInboundVehQueryDto.setSettleMoney(String.valueOf(baseVehicleDRCL.getCostPrice()));
+                            scmApplyInboundVehQueryDto.setLocalName("在途仓库");
+                            scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
+                            scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
                        }
                        stkInStock.setFInStockEntry(fInStockEntry);
                        //推送财务供应商信息
@ -583,7 +610,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                        bdSupplier.setFName(sysOrganizationDC.getName());
                        bdSupplier.setFLocMobile("13333333333");
                        bdSupplier.setFNumber(otherCodeDC);
-                        bdSupplier.setFUseOrgId(orgCodeDC);
+                        bdSupplier.setFUseOrgId(orgCodeDR);
                        //推送车辆入库查询
                        ScmApplyInboundQueryDto scmApplyInboundQueryDto = new ScmApplyInboundQueryDto();
                        scmApplyInboundQueryDto.setOrgPriceDate(DateUtil.formatDate(new Date()));
@ -606,24 +633,6 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                        SysOrganizationVo sysOrganizationVoCreate = sysOrganizationFeign.fetchBySid(baseAccadjApply.getCreateOrgSid()).getData();
                        scmApplyInboundQueryDto.setCreateOrgName(sysOrganizationVoCreate.getName());
                        scmApplyInboundQueryDto.setBusSid(baseAccadjApply.getSid());
-                        List<ScmApplyInboundVehQueryDto> scmApplyInboundVehQuerys = new ArrayList<>();
-                        for (BaseInternalPurchaseVehicle baseInternalPurchaseVehicle : baseInternalPurchaseVehicles2) {
-                            ScmApplyInboundVehQueryDto scmApplyInboundVehQueryDto = new ScmApplyInboundVehQueryDto();
-                            scmApplyInboundVehQueryDto.setVinNo(baseInternalPurchaseVehicle.getVinNo());
-                            BaseVehicle baseVehicle1 = baseVehicleService.selVehicleByVinNoAndOrgSid(baseInternalPurchaseVehicle.getVinNo(), baseAccadjApply.getCallInOrgSid());
-                            BaseVehicleBrand baseVehicleBrand = baseVehicleBrandService.fetchBySid(baseVehicle1.getCarBrandSid());
-                            scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleBrand.getBrandCode());
-                            scmApplyInboundVehQueryDto.setMgroupName(baseVehicleBrand.getBrandName());
-                            BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicle1.getModelSid()).getData();
-                            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
-                            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
-                            scmApplyInboundVehQueryDto.setIunit("辆");
-                            scmApplyInboundVehQueryDto.setNum("1");
-                            scmApplyInboundVehQueryDto.setSettleMoney(String.valueOf(baseVehicle1.getCostPrice()));
-                            scmApplyInboundVehQueryDto.setLocalName("在途仓库");
-                            scmApplyInboundVehQueryDto.setLocalCode("ARZTCK");
-                            scmApplyInboundVehQuerys.add(scmApplyInboundVehQueryDto);
-                        }
                        scmApplyInboundQueryDto.setScmApplyInboundVehQueryList(scmApplyInboundVehQuerys);
                        ResultBean<String> save = scmApplyInboundQueryFeign.save(scmApplyInboundQueryDto);
                        if (!save.getSuccess()) {
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java
@ -525,9 +525,8 @@ public class BaseVehicleRest implements BaseVehicleFeign {
            scmApplyInboundVehQueryDto.setVinNo(baseVehicleDto1.getVinNo());
            scmApplyInboundVehQueryDto.setMgroupCode(baseVehicleDto1.getCarBrandCode());
            scmApplyInboundVehQueryDto.setMgroupName(baseVehicleDto1.getCarBrandName());
-            BaseVehicleModel baseVehicleModel = baseVehicleModelService.selectDetails(baseVehicleDto1.getModelSid()).getData();
-            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleModel.getVehicleType());
-            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleModel.getVehicleTypeValue());
+            scmApplyInboundVehQueryDto.setVehicleTypeKey(baseVehicleDto1.getManufSaleAccessKey());
+            scmApplyInboundVehQueryDto.setVehicleTypeValue(baseVehicleDto1.getManufSaleAccessName());
            scmApplyInboundVehQueryDto.setIunit("辆");
            scmApplyInboundVehQueryDto.setNum("1");
            scmApplyInboundVehQueryDto.setSettleMoney(Float.toString(baseVehicleDto1.getCostPrice()));
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java
@ -84,8 +84,6 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
    @Autowired
    private BaseVehinstallService baseVehinstallService;
    @Autowired
-    private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
-    @Autowired
    private BusSalesOrderFeign busSalesOrderFeign;
    @Autowired
    private SysUserFeign sysUserFeign;
@ -683,17 +681,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
    private BdCustomer createBdMiddle(BaseVehicle baseVehicle, BaseVehicleOutDto dto) {
        BdCustomer bdCustomer = new BdCustomer();
        BasePurchaseSystemDetailsVo data = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
-        if (data != null) {
-            bdCustomer.setTOrgIds(data.getOrgCode());
-        } else {
-            ResultBean<SysOrganizationVo> resultBean = sysOrganizationFeign.fetchBySid(baseVehicle.getCreateOrgSid());
-            if (resultBean.getSuccess()) {
-                SysOrganizationVo vo = resultBean.getData();
-                if (vo != null) {
-                    bdCustomer.setTOrgIds(vo.getOrgCode());
-                }
-            }
-        }
+        bdCustomer.setTOrgIds(data.getOrgCode());
        //TODO 去中介人表 查询手机号码  根据中介人sid: middleOneSid
        //  拼接： bdCustomer.setFName(中介人名称（MiddleOne） + 手机号后四位);
        BaseMiddleman baseMiddleman = baseMiddlemanService.fetchBySid(dto.getMiddleOneSid());
--- a/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java
+++ b/anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysfunction/SysFunctionVo.java
@ -54,4 +54,6 @@ public class SysFunctionVo implements Vo {
    @ApiModelProperty("前端控制按钮的id")
    @JsonProperty("cId")
    private String cId;
+    @ApiModelProperty("说明")
+    private String remarks;
 }
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.xml
@ -62,7 +62,7 @@
    </select>
    <select id="getButtonPermissions" resultType="com.yxt.anrui.portal.api.sysfunction.ButtonPermissionVo">
        select sf.cId as buttonId from sys_function sf
-        where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid in(
+        where actionUrl=#{query.url} and phoneFunction=#{query.type} and sid not in(
            SELECT srf.functionSid FROM sys_user_role sur
            LEFT JOIN sys_role_function srf  ON sur.roleSid = srf.rolesid
            WHERE sur.userSid=#{query.userSid})
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
@ -85,7 +85,7 @@ public class SysMenuRest implements SysMenuFeign {

    @Override
    public ResultBean<List<Map<String, String>>> getMenusForFunction(@RequestBody SysMenuFunctionQuery sysMenuFunctionQuery) {
-        ResultBean rb = ResultBean.fireFail();
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                             ResultBean rb = ResultBean.fireFail();
        SysMenuQuery smq= new SysMenuQuery();
        smq.setSourceSid(sysMenuFunctionQuery.getSourceSid());
        List<SysMenuTreeVo> list = sysMenuService.listAllVoForSource(smq);
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrolefunction/SysRoleFunctionMapper.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysrolefunction/SysRoleFunctionMapper.java
@ -38,6 +38,6 @@ public interface SysRoleFunctionMapper extends BaseMapper<SysRoleFunction> {
 	
 	@Select("select * from sys_role_function")
 	List<SysRoleFunctionVo> selectListVo();
-	@Delete("delete from sys_source_role where roleSid=#{roleSid}  ")
+	@Delete("delete from sys_role_function where roleSid=#{roleSid}  ")
    void deleteByRoleSid(@Param("roleSid") String roleSid);
 }
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java
@ -126,6 +126,7 @@ public class ScmApplyInboundQueryService extends MybatisBaseService<ScmApplyInbo
        if (StringUtils.isNotBlank(query.getMakeListName())) {
            qw.like("saiq.makeListName", query.getMakeListName());
        }
+        qw.orderByDesc("saiq.createTime");
        IPage<ScmApplyInboundQuery> page = PagerUtil.queryToPage(pq);
        IPage<ScmApplyInboundQueryVo> pagging = baseMapper.selectPageVo(page, qw);
        PagerVo<ScmApplyInboundQueryVo> p = PagerUtil.pageToVo(pagging, null);