From b673f4b4668bed52eb3db09f1321622d4f31e3a9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期六, 28 六月 2025 17:29:06 +0800
Subject: [PATCH] 6月28号新需求
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocServiceImpl.java | 13 ++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocService.java | 2 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocMapper.java | 2 +
zy-asrs-wms/src/main/resources/mapper/asrs/LocMapper.xml | 3 +
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java | 5 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java | 25 ++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java | 5 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java | 4 ++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java | 22 +++++++++++
10 files changed, 83 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
index 827f327..3e95bec 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MatController.java
+++ b/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));
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
index db9e923..6a0bc81 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/MobileController.java
@@ -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
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
index 59b6a8b..34a6a1e 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/entity/Mat.java
+++ b/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;
+
/**
* 淇濊川鏈�
*/
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocMapper.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocMapper.java
index ec19a3f..2758c03 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/mapper/LocMapper.java
+++ b/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();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocService.java
index 03e1031..f96c89c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/LocService.java
+++ b/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();
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
index 4f04467..fa7e28d 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/MobileService.java
+++ b/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);
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocServiceImpl.java
index 8733bd8..55d2d34 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/LocServiceImpl.java
+++ b/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();
+ }
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
index c1a5dc7..e659c7c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/MobileServiceImpl.java
+++ b/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)));
+ }
+
}
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
index 302f67a..85dbb26 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderServiceImpl.java
+++ b/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;
diff --git a/zy-asrs-wms/src/main/resources/mapper/asrs/LocMapper.xml b/zy-asrs-wms/src/main/resources/mapper/asrs/LocMapper.xml
index a31a794..5608c14 100644
--- a/zy-asrs-wms/src/main/resources/mapper/asrs/LocMapper.xml
+++ b/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>
--
Gitblit v1.9.1