问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -51,6 +51,10 @@ public interface BaseVehicleOutFeign {
     @ResponseBody
     ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType);
 
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySid")
+    @ResponseBody
+    public ResultBean delBySid(@RequestParam("sid") String sid);
 }
 
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java

@@ -491,4 +491,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
 
 
     BasePurchSystemVo getSystem(@Param("useOrgSid") String useOrgSid, @Param("purchaseSystemSid") String purchaseSystemSid);
+
+    void updateVehicleStateAndSaleDate(String sid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -1048,7 +1048,7 @@
                         or bv.vehicleStateValue = '在途'
                         or bv.vehicleStateValue = '调入'
                 )
-        order by isFictitious,bv.locationName,bv.vinNo desc
+        order by isFictitious, bv.locationName, bv.vinNo desc
     </select>
 
     <select id="selectAppListOne" resultType="com.yxt.anrui.base.api.basevehicle.app.AppBaseVehicleOrderVo">
@@ -1563,11 +1563,22 @@
     <select id="selectByfMaterialID" resultType="java.lang.String">
         SELECT orderingNo
         FROM base_vehicle
-        WHERE vinNo like concat('%', #{fMaterialID}, '%')
+        WHERE vinNo like concat('%', #{fMaterialID}, '%') LIMIT 1
-        LIMIT 1
     </select>
 
     <select id="getSystem" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchSystemVo">
-        select purchaseSystemName,sid from base_purchase_system where useOrgSid = #{useOrgSid} and deptSid = #{purchaseSystemSid}
+        select purchaseSystemName, sid
+        from base_purchase_system
+        where useOrgSid = #{useOrgSid}
+          and deptSid = #{purchaseSystemSid}
     </select>
+
+    <update id="updateVehicleStateAndSaleDate">
+        UPDATE
+                base_vehicle
+        SET vehicleState      = "0001",
+            vehicleStateValue = "库存",
+            salesDate         = null
+        WHERE sid = #{sid}
+    </update>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -3645,4 +3645,8 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         basePurchSystemVo.setPurchaseSystemName(baseVehicle.getPurchaseSystemName());
         return rb.success().setData(basePurchSystemVo);
     }
+
+    public void updateVehicleStateAndSaleDate(String sid) {
+        baseMapper.updateVehicleStateAndSaleDate(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutRest.java

@@ -58,4 +58,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
         PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid,printerType);
         return rb.success().setData(pdf);
     }
+
+    @Override
+    public ResultBean delBySid(String sid) {
+        return baseVehicleOutService.delBySid(sid);
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -291,6 +291,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
         baseVehicleOut.setCreateBySid(dto.getCreateBySid());
         baseVehicleOut.setCreateByName(dto.getCreateByName());
+        baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
         //保存车辆出库单子表
         baseMapper.insert(baseVehicleOut);
         dto.setBillNo(billNo);
@@ -580,6 +581,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         baseVehicleOut.setMainSid(baseVehicleOutApply.getSid());
         baseVehicleOut.setCreateBySid(dto.getCreateBySid());
         baseVehicleOut.setCreateByName(dto.getCreateByName());
+        baseVehicleOut.setCwCustomerNo(bdCustomer.getFNumber());
         //保存车辆出库单子表
         baseMapper.insert(baseVehicleOut);
         dto.setBillNo(billNo);
@@ -1103,4 +1105,16 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
     public BaseVehicleOutDetailsVo selByOrgSidAndVehSid(String useOrgSid, String vehSid) {
         return baseMapper.selByOrgSidAndVehSid(useOrgSid, vehSid);
     }
+
+    public ResultBean delBySid(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseVehicleOut baseVehicleOut = fetchBySid(sid);
+        //删除出库车辆信息
+        deleteBySid(sid);
+        //删除出库申请单
+        baseVehicleOutApplyService.deleteBySid(baseVehicleOut.getMainSid());
+        BaseVehicle baseVehicle = baseVehicleService.selVehicleByVinNoAndOrgSid(baseVehicleOut.getVinNo(), baseVehicleOut.getCreateOrgSid());
+        baseVehicleService.updateVehicleStateAndSaleDate(baseVehicle.getSid());
+        return rb.success();
+    }
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionMapper.java

@@ -62,8 +62,10 @@ public interface SysFunctionMapper extends BaseMapper<SysFunction> {
     List<Map<String, Object>> getSourceAuthorization(@Param("roleSid")String roleSid);
     @Select("SELECT sm.name,sm.sid,sm.pageUrl FROM sys_menu sm  LEFT JOIN sys_source_menu ssm ON sm.sid=ssm.menuSid where ssm.sourceSid=#{sourceSid}")
     List<Map<String, Object>> getMenuAuthorization(@Param("sourceSid") String sourceSid);
+    @Select("SELECT sf.name,sf.sid FROM sys_function sf WHERE sf.actionUrl= #{pageUrl}")
+    List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
     @Select("SELECT sf.name,sf.sid,IF(IFNULL(srf.id,0)<=0,1,0) checked  FROM sys_function sf  " +
             " LEFT JOIN sys_role_function srf ON srf.functionSid=sf.sid  " +
-            " WHERE sf.actionUrl= #{pageUrl} ")
+            " WHERE sf.actionUrl= #{pageUrl} AND srf.roleSid = #{roleSid} ")
-    List<Map<String, Object>> getFunctionAuthorization(@Param("pageUrl") String pageUrl);
+    List<Map<String, Object>> getFunctionByRoleSid(@Param("pageUrl") String pageUrl,@Param("roleSid") String roleSid);
 }

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysfunction/SysFunctionService.java

@@ -39,6 +39,7 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
     private SysSourceService sysSourceService;
     @Autowired
     private SysSourceFunctionService sysSourceFunctionService;
+
     public PagerVo<SysFunction> listPage(PagerQuery<SysFunctionQuery> pq) {
         SysFunctionQuery query = pq.getParams();
         QueryWrapper<SysFunction> qw = createQueryWrapper(query);
@@ -47,10 +48,12 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
         PagerVo<SysFunction> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
+
     public List<SysFunction> listAll(SysFunctionQuery query) {
         QueryWrapper<SysFunction> qw = createQueryWrapper(query);
         return baseMapper.selectList(qw);
     }
+
     private QueryWrapper<SysFunction> createQueryWrapper(SysFunctionQuery query) {
         // todo: 这里根据具体业务调整查询条件
         // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -100,53 +103,57 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
         QueryWrapper<SysFunction> qw = new QueryWrapper<>();
         qw.eq("func.parentSid", "0");
         List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
-		for(SysFunctionVo s:sysFunctionVos){
+        for (SysFunctionVo s : sysFunctionVos) {
             getChildrens(s);
         }
         return sysFunctionVos;
     }
-	private void getChildrens(SysFunctionVo s){
+
+    private void getChildrens(SysFunctionVo s) {
         String sid = s.getSid();
         QueryWrapper<SysFunction> qw = new QueryWrapper<>();
         if (StringUtils.isNotBlank(sid)) {
             qw.eq("func.parentSid", sid);
         }
         List<SysFunctionVo> sysFunctionVos = baseMapper.selectListAllVo(qw);
-		if(!sysFunctionVos.isEmpty()){
+        if (!sysFunctionVos.isEmpty()) {
-			for(SysFunctionVo sfv:sysFunctionVos){
+            for (SysFunctionVo sfv : sysFunctionVos) {
                 getChildrens(sfv);
             }
         }
         s.setChildren(sysFunctionVos);
     }
+
     public List<SysFunctionVo> listVo() {
         return baseMapper.selectListVo();
     }
 
-	public void saveOrUpdateDto(SysFunctionDto dto){
+    public void saveOrUpdateDto(SysFunctionDto dto) {
         SysFunction entity = new SysFunction();
         dto.fillEntity(entity);
         SysSourceFunction sysSourceFunction = new SysSourceFunction();
         sysSourceFunction.setFunctionSid(entity.getSid());
         sysSourceFunction.setSourceSid(dto.getSourceSid());
-		setRootSid(entity,sysSourceFunction);
+        setRootSid(entity, sysSourceFunction);
         sysSourceFunctionService.save(sysSourceFunction);
         this.saveOrUpdate(entity);
     }
-	private void setRootSid(SysFunction entity,SysSourceFunction sysSourceFunction){
+
+    private void setRootSid(SysFunction entity, SysSourceFunction sysSourceFunction) {
         String pSid = entity.getParentSid();
-		if("0".equals(pSid)){
+        if ("0".equals(pSid)) {
             sysSourceFunction.setFunctionRootSid(entity.getSid());
-		}else{
+        } else {
             SysFunction sysFunction = this.fetchBySid(pSid);
             String pSid1 = sysFunction.getParentSid();
-			if("0".equals(pSid1)){
+            if ("0".equals(pSid1)) {
                 sysSourceFunction.setFunctionRootSid(sysFunction.getSid());
             }
-			setRootSid(sysFunction,sysSourceFunction);
+            setRootSid(sysFunction, sysSourceFunction);
         }
     }
-	public SysFunctionVo fetchByIdVo(String id){
+
+    public SysFunctionVo fetchByIdVo(String id) {
         SysFunction entity = this.fetchById(id);
         SysFunctionVo vo = new SysFunctionVo();
         BeanUtil.copyProperties(entity, vo);
@@ -154,17 +161,18 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
     }
 
     public List<SysFunctionVo> listAllByRoleSid(SysFunctionQuery query) {
-		List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(),"0");
+        List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(query.getRoleSid(), "0");
-		for(SysFunctionVo s:sysFunctionVos){
+        for (SysFunctionVo s : sysFunctionVos) {
-			getChildrensByRoleSid(s,query.getRoleSid());
+            getChildrensByRoleSid(s, query.getRoleSid());
         }
         return sysFunctionVos;
     }
-	private void getChildrensByRoleSid(SysFunctionVo s,String roleSid){
+
-		List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid,s.getSid());
+    private void getChildrensByRoleSid(SysFunctionVo s, String roleSid) {
-		if(!sysFunctionVos.isEmpty()){
+        List<SysFunctionVo> sysFunctionVos = baseMapper.listAllParentByRoleSid(roleSid, s.getSid());
-			for(SysFunctionVo sfv:sysFunctionVos){
+        if (!sysFunctionVos.isEmpty()) {
-				getChildrensByRoleSid(sfv,roleSid);
+            for (SysFunctionVo sfv : sysFunctionVos) {
+                getChildrensByRoleSid(sfv, roleSid);
             }
         }
         s.setChildren(sysFunctionVos);
@@ -239,42 +247,50 @@ public class SysFunctionService extends MybatisBaseService<SysFunctionMapper, Sy
 
     public List<ButtonPermissionVo> getButtonPermissions(ButtonPermissionQuery query) {
         List<ButtonPermissionVo> buttonPermissions = baseMapper.getButtonPermissions(query);
-		return buttonPermissions ;
+        return buttonPermissions;
     }
 
     public List<Map<String, Object>> getFunctionAuthorization(String roleSid) {
-		List<Map<String,Object>> list=new ArrayList<>();
+        List<Map<String, Object>> list = new ArrayList<>();
-		List<Map<String, Object>> lsources=baseMapper.getSourceAuthorization(roleSid);
+        List<Map<String, Object>> lsources = baseMapper.getSourceAuthorization(roleSid);
-		lsources.forEach(f->{
+        lsources.forEach(f -> {
-			Map<String,Object> map=new HashMap<>();
+            Map<String, Object> map = new HashMap<>();
-			map.put("name",f.get("sourceName").toString());
+            map.put("name", f.get("sourceName").toString());
-			map.put("sid",f.get("sid").toString());
+            map.put("sid", f.get("sid").toString());
-			map.put("checked","1");
+            map.put("checked", "1");
             list.add(map);
         });
 
-		list.forEach(f->{
+        list.forEach(f -> {
-			List<Map<String,Object>> list2=new ArrayList<>();
+            List<Map<String, Object>> list2 = new ArrayList<>();
             String sid = f.get("sid").toString();
-			List<Map<String, Object>> lmenus=baseMapper.getMenuAuthorization(sid);
+            List<Map<String, Object>> lmenus = baseMapper.getMenuAuthorization(sid);
-			lmenus.forEach(ff->{
+            lmenus.forEach(ff -> {
-				Map<String,Object> map=new HashMap<>();
+                Map<String, Object> map = new HashMap<>();
-				map.put("name",ff.get("name"));
+                map.put("name", ff.get("name"));
                 String sids = ff.get("sid").toString();
-				map.put("sid",sids);
+                map.put("sid", sids);
-				map.put("checked","1");
+                map.put("checked", "1");
-				map.put("children",new ArrayList<>());
+                map.put("children", new ArrayList<>());
-				if( ff.get("pageUrl")!=null&& com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())){
+                if (ff.get("pageUrl") != null && com.yxt.common.base.utils.StringUtils.isNotBlank(ff.get("pageUrl").toString())) {
-					String pageUrl =ff.get("pageUrl").toString();
+                    String pageUrl = ff.get("pageUrl").toString();
-					List<Map<String, Object>> lfuncs=baseMapper.getFunctionAuthorization(pageUrl);
+                    List<Map<String, Object>> lfuncs = baseMapper.getFunctionAuthorization(pageUrl);
-					lfuncs.forEach(fun->{
+                    List<Map<String, Object>> functionByRoleSid = baseMapper.getFunctionByRoleSid(pageUrl, roleSid);
-						fun.put("children",new ArrayList<>());
+                    if (lfuncs.size() > 0){
-					});
+                        for (Map<String, Object> lfunc : lfuncs) {
-					map.put("children",lfuncs);
+                            for (Map<String, Object> funByRole : functionByRoleSid) {
+                                if (lfunc.get("sid").equals(funByRole.get("sid"))) {
+                                    lfunc.put("checked", "0");
+                                }
+                            }
+                            lfunc.put("children", new ArrayList<>());
+                        }
+                    }
+                    map.put("children", lfuncs);
                 }
                 list2.add(map);
             });
-			f.put("children",list2);
+            f.put("children", list2);
         });
         return list;
     }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryMapper.xml

@@ -9,6 +9,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
+        ORDER BY saiq.createTime DESC
     </select>
 
     <select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryVo">

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinboundquery/ScmApplyInboundQueryService.java

@@ -126,7 +126,6 @@ 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);