From e04d2cd03fb5a9228b8c71f6c4cfaf490defc2c7 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 09:16:09 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 80f085f..18548ae 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -544,9 +544,9 @@
if (Cools.isEmpty(param.getBarcode(), param.getCombMats())) {
throw new CoolException(BaseRes.PARAM);
}
- if(param.getCombMats().size()>1){
- throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
- }
+// if(param.getCombMats().size()>1){
+// throw new CoolException("璇锋彁鍙栦竴涓晢鍝侊紝鎴栬�呭埛鏂伴噸鏂扮粍鎵橈紒");
+// }
// 鍒ゆ柇鏄惁鏈夌浉鍚屾潯鐮佺殑鏁版嵁
if (waitPakinService.selectCount(new EntityWrapper<WaitPakin>().
eq("zpallet", param.getBarcode()).eq("io_status", "N")) > 0) {
@@ -668,6 +668,46 @@
}
+ @Override
+ @Transactional
+ public R kittingQuery(CombParam combParam, Long userId) {
+ List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
+ return R.ok().add(locDetlList);
+ }
+
+ @Override
+ @Transactional
+ public void kittingCall(String locNo, Long userId) {
+
+ }
+
+ @Override
+ @Transactional
+ public R locOriginInOut(LocDetl locDetl, Long userId) {
+ try{
+ Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>()
+ .eq("loc_no", locDetl.getLocNo())
+ .eq("zpallet", locDetl.getZpallet())
+ .eq("matnr", locDetl.getMatnr())
+ .eq("specs", locDetl.getSpecs())
+ .eq("batch", locDetl.getBatch())
+ .eq("origin", locDetl.getOrigin());
+ LocDetl locDetl1 = locDetlService.selectOne(wrapper);
+ if (Cools.isEmpty(locDetl1)){
+ return R.error();
+ } else if (locDetl1.getOrigin().equals("涓嶅湪搴�")){
+ locDetl1.setOrigin("鍦ㄥ簱");
+ }else{
+ locDetl1.setOrigin("涓嶅湪搴�");
+ }
+ if (locDetlService.update(locDetl1,wrapper)){
+ return R.ok();
+ }
+ } catch (Exception e){
+
+ }
+ return R.error();
+ }
// 鍟嗗搧涓婃灦
@Override
public void onSale(CombParam param) {
--
Gitblit v1.9.1