zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.parser.Feature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; @@ -52,7 +53,9 @@ public R page(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<Mat, BaseParam> pageParam = new PageParam<>(baseParam, Mat.class); PageParam<Mat, BaseParam> page = matService.page(pageParam, pageParam.buildWrapper(true)); QueryWrapper<Mat> queryWrapper = pageParam.buildWrapper(true); queryWrapper.orderByDesc("uniliz"); PageParam<Mat, BaseParam> page = matService.page(pageParam, queryWrapper); JSONObject data = JSON.parseObject(JSON.toJSONString(page));
@@ -295,6 +295,31 @@ return mobileService.selectShippingDetl(params); } /** * @author Ryan * @date 2025/6/28 * @description: 获取推荐库位 * @version 1.0 */ @PostMapping("/recommend/locs") public R getRecommend() { return mobileService.getRecommendLocs(); } /** * @author Ryan * @date 2025/6/28 * @description: 查询物料信息 * @version 1.0 */ @GetMapping("/mats/search/{matnr}") public R getMats(@PathVariable String matnr) { return mobileService.getMatsByCode(matnr); } /** * 确认发货单明细 * @return zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
@@ -244,6 +244,9 @@ @ApiModelProperty(value = "供应商编码") private String suppCode; @ApiModelProperty("使用次数") private Integer utiliz; /** * 保质期 */ zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocMapper.java
@@ -1,5 +1,6 @@ package com.zy.asrs.wms.asrs.mapper; import com.zy.asrs.framework.common.R; import com.zy.asrs.wms.asrs.entity.Loc; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; @@ -13,4 +14,5 @@ List<Long> listBySts(Long sts); R getRecommendLocs(); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocService.java
@@ -1,6 +1,7 @@ package com.zy.asrs.wms.asrs.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zy.asrs.framework.common.R; import com.zy.asrs.wms.asrs.entity.Loc; import java.util.List; @@ -9,4 +10,5 @@ List<Long> listBySts(Long sts); R getRecommengLocs(); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
@@ -31,4 +31,8 @@ R selectShippingDetl(Map<String, Object> params); R confirmShippingDetl(List<ShippingOrderDetlDto> params); R getRecommendLocs(); R getMatsByCode(String matnr); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocServiceImpl.java
@@ -1,5 +1,6 @@ package com.zy.asrs.wms.asrs.service.impl; import com.zy.asrs.framework.common.R; import com.zy.asrs.wms.asrs.entity.enums.LocStsType; import com.zy.asrs.wms.asrs.mapper.LocMapper; import com.zy.asrs.wms.asrs.entity.Loc; @@ -17,4 +18,16 @@ public List<Long> listBySts(Long sts) { return this.baseMapper.listBySts(sts); } /** * @author Ryan * @date 2025/6/28 * @description: 获取平库推荐库位 * @version 1.0 */ @Override public R getRecommengLocs() { return this.baseMapper.getRecommendLocs(); } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
@@ -560,4 +560,26 @@ return R.ok("发货完成！！"); } /** * @author Ryan * @date 2025/6/28 * @description: 获取平库推荐库位 * @version 1.0 */ @Override public R getRecommendLocs() { return locService.getRecommengLocs(); } /** * @author Ryan * @date 2025/6/28 * @description: 查询物料信息 * @version 1.0 */ @Override public R getMatsByCode(String matnr) { return R.ok().add(matService.list(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, matnr))); } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
@@ -132,6 +132,11 @@ throw new CoolException("更新明细索引失败"); } mat.setUtiliz(mat.getUtiliz() + 1); if (!matService.updateById(mat)) { throw new CoolException("物料使用率修改失败！！"); } } return true; zy-asrs-wms/src/main/resources/mapper/asrs/LocMapper.xml
@@ -6,5 +6,8 @@ select * from man_loc where loc_sts_id = #{sts} </select> <select id="getRecommendLocs" resultType="com.zy.asrs.framework.common.R"> SELECT id, loc_no, loc_sts_id, row1, bay1, lev1, barcode, `status`, flag FROM man_loc WHERE loc_no LIKE '%B%' OR loc_no LIKE '%C%' </select> </mapper>
