From 7c2c11719b6aa2043e0167184e212577e2cf6056 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期六, 11 九月 2021 16:22:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/mapper/LocDetlMapper.java | 1 +
src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java | 12 +++++++++++-
src/main/java/com/zy/asrs/service/LocDetlService.java | 1 +
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 9 +++++++++
src/main/java/com/zy/asrs/entity/WrkDetl.java | 4 ++++
src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java | 1 +
src/main/java/com/zy/asrs/controller/MobileController.java | 10 ++++++++++
src/main/webapp/views/pda/stockCheck.html | 3 ++-
src/main/java/com/zy/asrs/service/WrkDetlService.java | 7 ++++++-
9 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 9ba2830..361e6f3 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -190,4 +190,14 @@
}
return R.ok().add(vos);
}
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ @RequestMapping("/check/queryMatFromDevNo")
+ public R queryMatFromDevNo(Integer devNo) {
+ List<WrkDetl> list = wrkDetlService.queryMatFromDevNo(devNo);
+ return R.ok().add(list);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index ef86a17..eefd3cf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -134,6 +134,10 @@
@TableField("appe_time")
private Date appeTime;
+ @ApiModelProperty(value= "搴撲綅鍙�")
+ @TableField(exist = false)
+ private Integer locNo;
+
public String getIoTime$(){
if (Cools.isEmpty(this.ioTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
index e7bd2f6..b5146b2 100644
--- a/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocDetlMapper.java
@@ -45,4 +45,5 @@
*/
@Select("select mat_no,mat_name,sum(qty) qty from asr_loc_detl group by mat_no,mat_name")
List<LocDetl> getStockSum();
+
}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
index 4bd53df..aced022 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkDetlMapper.java
@@ -2,8 +2,9 @@
import com.baomidou.mybatisplus.mapper.BaseMapper;
import com.zy.asrs.entity.WrkDetl;
-import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -12,4 +13,13 @@
@Repository
public interface WrkDetlMapper extends BaseMapper<WrkDetl> {
List<WrkDetl> queryWrkDetl(@Param("matNo") String matNo,@Param("locNo") String locNo);
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ * @param devNo
+ * @return
+ */
+ @Select("select b.source_loc_no as locNo, a.mat_no as matNo,a.mat_name as matName,a.qty as qty" +
+ " from asr_wrk_detl a left join asr_wrk_mast b on a.wrk_no = b.wrk_no where a.wrk_no = (select wrk_no from asr_bas_devp where dev_no = #{devNo})")
+ List<WrkDetl> queryMatFromDevNo(Integer devNo);
}
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index f5860b0..381823c 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -65,4 +65,5 @@
* @return
*/
public List<LocDetl> getStockSum();
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkDetlService.java b/src/main/java/com/zy/asrs/service/WrkDetlService.java
index ca87add..fe0f06e 100644
--- a/src/main/java/com/zy/asrs/service/WrkDetlService.java
+++ b/src/main/java/com/zy/asrs/service/WrkDetlService.java
@@ -1,8 +1,8 @@
package com.zy.asrs.service;
import com.baomidou.mybatisplus.service.IService;
-import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
+import com.zy.asrs.entity.WrkDetl;
import java.util.List;
@@ -11,4 +11,9 @@
void createWorkDetail(Integer workNo, List<MatCodeCountDto> matCodeCountDtos, String barcode, Long userId);
List<WrkDetl> queryWrkDetl(String matNo, String locNo);
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ List<WrkDetl> queryMatFromDevNo(Integer devNo);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
index a53840d..bb4ef0f 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocDetlServiceImpl.java
@@ -76,4 +76,5 @@
public List<LocDetl> getStockSum() {
return locDetlMapper.getStockSum();
}
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 77f6ceb..8c41d80 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.MatCode;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.MatCodeCountDto;
@@ -58,4 +59,12 @@
public List<WrkDetl> queryWrkDetl(String matNo, String locNo) {
return baseMapper.queryWrkDetl(matNo, locNo);
}
+
+ /**
+ * PDA鐩樼偣鏍规嵁鍑哄簱鍙ｆ煡璇㈠搴旂墿鏂欎俊鎭�
+ */
+ @Override
+ public List<WrkDetl> queryMatFromDevNo(Integer devNo) {
+ return baseMapper.queryMatFromDevNo(devNo);
+ }
}
diff --git a/src/main/webapp/views/pda/stockCheck.html b/src/main/webapp/views/pda/stockCheck.html
index 5dfcfc8..6f92266 100644
--- a/src/main/webapp/views/pda/stockCheck.html
+++ b/src/main/webapp/views/pda/stockCheck.html
@@ -211,9 +211,10 @@
form.on('select(changeDevNo)', function (data) {
+ debugger
souceData = []; // 鍒濆鍖栬〃鏍兼暟鎹褰�
$.ajax({
- url: baseUrl + "/erp/queryMatFromDevNo?devNo=" + data.value,
+ url: baseUrl + "/mobile/check/queryMatFromDevNo?devNo=" + data.value,
headers: {'token': localStorage.getItem('token')},
contentType: 'application/json;charset=UTF-8',
method: 'GET',
--
Gitblit v1.9.1