From 829f315f17de8cd04756a6c53b325c368469d246 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 17 六月 2020 11:01:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/WorkService.java | 4 +-
src/main/java/com/zy/asrs/controller/WrkDetlController.java | 6 ++
src/main/java/com/zy/common/model/OutLocDto.java | 16 +++----
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 43 +++++++++++----------
src/main/java/com/zy/common/model/LocDetlDto.java | 37 ++++++++++++++++++
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 6 +-
src/main/webapp/static/js/wrkDetl/wrkDetl.js | 8 +--
7 files changed, 79 insertions(+), 41 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlController.java b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
index 4539ea0..c645c25 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlController.java
@@ -43,7 +43,11 @@
excludeTrash(param);
EntityWrapper<WrkDetl> wrapper = new EntityWrapper<>();
convert(param, wrapper);
- if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ if (!Cools.isEmpty(orderByField)){
+ wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
+ } else {
+ wrapper.orderBy("appe_time", false);
+ }
return R.ok(wrkDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index b0164b6..7f20af6 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -38,7 +38,7 @@
private String matnr;
// 鏁伴噺
- private Integer count;
+ private Double count;
public String getLocNo() {
return locNo;
@@ -56,11 +56,11 @@
this.matnr = matnr;
}
- public Integer getCount() {
+ public Double getCount() {
return count;
}
- public void setCount(Integer count) {
+ public void setCount(Double count) {
this.count = count;
}
}
diff --git a/src/main/java/com/zy/asrs/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index f2cc653..e6e594e 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -1,10 +1,10 @@
package com.zy.asrs.service;
import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.common.model.LocDetlDto;
import java.util.List;
@@ -27,7 +27,7 @@
* @param staNo 鐩爣绔欑偣
* @param locDetls 寰呭嚭搴撶墿鏂�
*/
- void stockOut(BasDevp staNo, List<LocDetl> locDetls, Long userId);
+ void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, Long userId);
/**
* 绌烘澘鍏ュ簱
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 9571db7..e18f821 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.FullStoreParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.*;
+import com.zy.common.model.LocDetlDto;
import com.zy.common.model.OutLocDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
@@ -116,19 +117,19 @@
// 鐩爣绔欑偣鐘舵�佹娴�
BasDevp staNo = basDevpService.checkSiteStatus(param.getOutSite());
// 鑾峰彇搴撲綅鏄庣粏
- List<LocDetl> locDetls = new ArrayList<>();
+ List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl locDetl : param.getLocDetls()) {
if (!Cools.isEmpty(locDetl.getLocNo(), locDetl.getMatnr(), locDetl.getCount())) {
LocDetl sqlParam = new LocDetl();
sqlParam.setLocNo(locDetl.getLocNo());
sqlParam.setMatnr(locDetl.getMatnr());
LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
- if (null != one) locDetls.add(one);
+ if (null != one) locDetlDtos.add(new LocDetlDto(one, locDetl.getCount()));
}
}
- if (!locDetls.isEmpty()) {
+ if (!locDetlDtos.isEmpty()) {
// 鍚姩鍑哄簱寮�濮�
- stockOut(staNo, locDetls, userId);
+ stockOut(staNo, locDetlDtos, userId);
} else {
throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
}
@@ -136,20 +137,20 @@
@Override
@Transactional
- public void stockOut(BasDevp staNo, List<LocDetl> locDetls, Long userId) {
+ public void stockOut(BasDevp staNo, List<LocDetlDto> locDetlDtos, Long userId) {
// 鐢熸垚宸ヤ綔鍙�
int workNo = commonService.getWorkNo(DEFAULT_WORK_NO_TYPE);
// 鍚堝苟鍚岀被椤�
Set<String> locNos = new HashSet<>();
- locDetls.forEach(locDetl -> locNos.add(locDetl.getLocNo()));
+ locDetlDtos.forEach(dto -> locNos.add(dto.getLocDetl().getLocNo()));
List<OutLocDto> dtos = new ArrayList<>();
for (String locNo : locNos) {
- List<LocDetl> list = new ArrayList<>();
- Iterator<LocDetl> iterator = locDetls.iterator();
+ List<LocDetlDto> list = new ArrayList<>();
+ Iterator<LocDetlDto> iterator = locDetlDtos.iterator();
while (iterator.hasNext()) {
- LocDetl locDetl = iterator.next();
- if (locNo.equals(locDetl.getLocNo())) {
- list.add(locDetl);
+ LocDetlDto dto = iterator.next();
+ if (locNo.equals(dto.getLocDetl().getLocNo())) {
+ list.add(dto);
iterator.remove();
}
}
@@ -192,19 +193,19 @@
throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐ワ紝鍑哄簱搴撲綅鍙凤細"+dto.getLocNo());
}
// 鐢熸垚宸ヤ綔妗ｆ槑缁�
- for (LocDetl locDetl : dto.getLocDetls()) {
+ for (LocDetlDto detlDto : dto.getLocDetlDtos()) {
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.setWrkNo(workNo);
wrkDetl.setIoTime(new Date());
- wrkDetl.setMatnr(locDetl.getMatnr());
- wrkDetl.setAnfme(locDetl.getAnfme()); // 鏁伴噺
- wrkDetl.setZmatid(locDetl.getZmatid());
- wrkDetl.setTbpos(locDetl.getTbpos());
- wrkDetl.setTbnum(locDetl.getTbnum());
- wrkDetl.setLgnum(locDetl.getLgnum());
- wrkDetl.setAltme(locDetl.getAltme());
- wrkDetl.setBname(locDetl.getBname());
- wrkDetl.setMaktx(locDetl.getMaktx());
+ wrkDetl.setMatnr(detlDto.getLocDetl().getMatnr());
+ wrkDetl.setAnfme(detlDto.getCount()); // 鏁伴噺
+ wrkDetl.setZmatid(detlDto.getLocDetl().getZmatid());
+ wrkDetl.setTbpos(detlDto.getLocDetl().getTbpos());
+ wrkDetl.setTbnum(detlDto.getLocDetl().getTbnum());
+ wrkDetl.setLgnum(detlDto.getLocDetl().getLgnum());
+ wrkDetl.setAltme(detlDto.getLocDetl().getAltme());
+ wrkDetl.setBname(detlDto.getLocDetl().getBname());
+ wrkDetl.setMaktx(detlDto.getLocDetl().getMaktx());
wrkDetl.setAppeTime(new Date());
wrkDetl.setAppeUser(userId);
wrkDetl.setModiTime(new Date());
diff --git a/src/main/java/com/zy/common/model/LocDetlDto.java b/src/main/java/com/zy/common/model/LocDetlDto.java
new file mode 100644
index 0000000..98bfd25
--- /dev/null
+++ b/src/main/java/com/zy/common/model/LocDetlDto.java
@@ -0,0 +1,37 @@
+package com.zy.common.model;
+
+import com.zy.asrs.entity.LocDetl;
+
+/**
+ * Created by vincent on 2020/6/17
+ */
+public class LocDetlDto {
+
+ private LocDetl locDetl;
+
+ private Double count;
+
+ public LocDetlDto() {
+ }
+
+ public LocDetlDto(LocDetl locDetl, Double count) {
+ this.locDetl = locDetl;
+ this.count = count;
+ }
+
+ public LocDetl getLocDetl() {
+ return locDetl;
+ }
+
+ public void setLocDetl(LocDetl locDetl) {
+ this.locDetl = locDetl;
+ }
+
+ public Double getCount() {
+ return count;
+ }
+
+ public void setCount(Double count) {
+ this.count = count;
+ }
+}
diff --git a/src/main/java/com/zy/common/model/OutLocDto.java b/src/main/java/com/zy/common/model/OutLocDto.java
index 4f30726..ba007e0 100644
--- a/src/main/java/com/zy/common/model/OutLocDto.java
+++ b/src/main/java/com/zy/common/model/OutLocDto.java
@@ -1,7 +1,5 @@
package com.zy.common.model;
-import com.zy.asrs.entity.LocDetl;
-
import java.util.List;
/**
@@ -11,14 +9,14 @@
private String locNo;
- private List<LocDetl> locDetls;
+ private List<LocDetlDto> locDetlDtos;
public OutLocDto() {
}
- public OutLocDto(String locNo, List<LocDetl> locDetls) {
+ public OutLocDto(String locNo, List<LocDetlDto> locDetlDtos) {
this.locNo = locNo;
- this.locDetls = locDetls;
+ this.locDetlDtos = locDetlDtos;
}
public String getLocNo() {
@@ -29,11 +27,11 @@
this.locNo = locNo;
}
- public List<LocDetl> getLocDetls() {
- return locDetls;
+ public List<LocDetlDto> getLocDetlDtos() {
+ return locDetlDtos;
}
- public void setLocDetls(List<LocDetl> locDetls) {
- this.locDetls = locDetls;
+ public void setLocDetlDtos(List<LocDetlDto> locDetlDtos) {
+ this.locDetlDtos = locDetlDtos;
}
}
diff --git a/src/main/webapp/static/js/wrkDetl/wrkDetl.js b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
index 2e8e1ae..4885e9d 100644
--- a/src/main/webapp/static/js/wrkDetl/wrkDetl.js
+++ b/src/main/webapp/static/js/wrkDetl/wrkDetl.js
@@ -17,10 +17,8 @@
toolbar: '#toolbar',
cellMinWidth: 50,
cols: [[
- {type: 'checkbox'}
-// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
- ,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
- ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
+ {field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
+ ,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿', width: 160}
,{field: 'matnr', align: 'center',title: '鐗╂枡'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
@@ -32,7 +30,7 @@
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'bname', align: 'center',title: '鐢ㄦ埛ID'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ // ,{field: 'memo', align: 'center',title: '澶囨敞'}
// ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', style: 'cursor:pointer'}
// ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
// ,{field: 'appeUser$', align: 'center',title: '鍒涘缓鑰�',event: 'appeUser', style: 'cursor:pointer'}
--
Gitblit v1.9.1