From e429033bedde0bf5f997411e688495c9518ec469 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 14:28:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 58 ------------------
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 46 ++-------------
src/main/webapp/views/pakStore/locDetlQuery.html | 46 ---------------
src/main/webapp/static/js/pakStore/stockOut.js | 15 ++--
4 files changed, 17 insertions(+), 148 deletions(-)
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 f0d9867..b9502c4 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -1,10 +1,13 @@
package com.zy.asrs.entity.param;
+import lombok.Data;
+
import java.util.List;
/**
* Created by vincent on 2020/6/13
*/
+@Data
public class StockOutParam {
// 鍑虹珯鍙�
@@ -13,22 +16,7 @@
// 鐗╂枡缂栧彿闆嗗悎
private List<LocDetl> locDetls;
- public Integer getOutSite() {
- return outSite;
- }
-
- public void setOutSite(Integer outSite) {
- this.outSite = outSite;
- }
-
- public List<LocDetl> getLocDetls() {
- return locDetls;
- }
-
- public void setLocDetls(List<LocDetl> locDetls) {
- this.locDetls = locDetls;
- }
-
+ @Data
public static class LocDetl {
// 搴撲綅鍙�
@@ -37,32 +25,12 @@
// 鍟嗗搧缂栧彿
private String matnr;
+ // 鎵瑰彿
+ private String batch;
+
// 鏁伴噺
private Double count;
- public String getLocNo() {
- return locNo;
- }
-
- public void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public String getMatnr() {
- return matnr;
- }
-
- public void setMatnr(String matnr) {
- this.matnr = matnr;
- }
-
- public Double getCount() {
- return count;
- }
-
- public void setCount(Double count) {
- this.count = count;
- }
}
}
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 8c76df0..504ea6b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -19,7 +19,6 @@
import com.zy.common.service.CommonService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -153,10 +152,7 @@
List<LocDetlDto> locDetlDtos = new ArrayList<>();
for (StockOutParam.LocDetl paramLocDetl : param.getLocDetls()) {
if (!Cools.isEmpty(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getCount())) {
- LocDetl sqlParam = new LocDetl();
- sqlParam.setLocNo(paramLocDetl.getLocNo());
- sqlParam.setMatnr(paramLocDetl.getMatnr());
- LocDetl one = locDetlService.selectOne(new EntityWrapper<>(sqlParam));
+ LocDetl one = locDetlService.selectItem(paramLocDetl.getLocNo(), paramLocDetl.getMatnr(), paramLocDetl.getBatch());
if (null != one) locDetlDtos.add(new LocDetlDto(one, paramLocDetl.getCount()));
}
}
@@ -164,7 +160,7 @@
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
} else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException("搴撳瓨涓嶅瓨鍦�");
}
}
@@ -828,56 +824,6 @@
if (!locMastService.updateById(locMast)) {
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
- }
-
- @Autowired
- private JdbcTemplate jdbcTemplate;
- private boolean pickSite = false;
- private void stockOutRe(WrkMast wrkMast, List<WrkDetl> wrkDetls) {
- for (WrkDetl wrkDetl : wrkDetls) {
- List<LocDetl> locDetls = locDetlService.selectPakoutByRule(wrkDetl.getMatnr());
- double issued = wrkDetl.getAnfme();
- for (LocDetl locDetl : locDetls) {
- if (issued > 0) {
- // 鐢熸垚鍑哄簱宸ヤ綔妗�
- // 鍏ㄦ澘
- if (issued>=locDetl.getAnfme()) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- stockOut(staNo, detlDtos, 101, 9527L);
- // 鎷ｆ枡
- } else {
- int priorCount = jdbcTemplate.queryForObject("select isnull(count(*),0) from man_prior where 1=1 and matnr = '" + wrkDetl.getMatnr() + "'", Integer.class);
- if (priorCount > 0) {
- BasDevp staNo = basDevpService.checkSiteStatus(103);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(locDetl.getAnfme());
- detlDtos.add(dto);
- stockOut(staNo, detlDtos, 101, 9527L);
- } else {
- BasDevp staNo = basDevpService.checkSiteStatus(pickSite?113:109);
- List<LocDetlDto> detlDtos = new ArrayList<>();
- LocDetlDto dto = new LocDetlDto();
- dto.setLocDetl(locDetl);
- dto.setCount(issued>=locDetl.getAnfme()?locDetl.getAnfme():issued);
- detlDtos.add(dto);
- stockOut(staNo, detlDtos, 103, 9527L);
- }
-
- }
-
- // 鍓╀綑寰呭嚭鏁伴噺閫掑噺
- issued = issued - locDetl.getAnfme();
- }
- }
- }
- pickSite = !pickSite;
}
}
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index e129b84..f040a92 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -68,16 +68,16 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ layer.msg('璇峰厛鎻愬彇鍟嗗搧搴撳瓨', {icon: 2});
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
- layer.msg("璇烽�夋嫨鍑哄簱鍙�");
+ layer.msg("璇烽�夋嫨鍑哄簱鍙�", {icon: 2});
return;
}
var locDetls = [];
data.forEach(function(elem) {
- locDetls.push({locNo: elem.locNo, matnr: elem.matnr, count: elem.count});
+ locDetls.push({locNo: elem.locNo, matnr: elem.matnr, batch: elem.batch, count: elem.count});
});
let param = {
outSite: staNo,
@@ -93,11 +93,11 @@
if (res.code === 200){
locDetlData = [];
tableIns.reload({data: locDetlData,done:function (res) {limit();getOutBound();}});
- layer.msg(res.msg);
+ layer.msg(res.msg, {icon: 1});
} else if (res.code === 403){
top.location.href = baseUrl+"/";
} else {
- layer.msg(res.msg)
+ layer.msg(res.msg, {icon: 2})
}
}
});
@@ -141,7 +141,7 @@
}
})
-// 鎻愬彇鐗╂枡
+
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
@@ -162,7 +162,7 @@
for (var i=0;i<data.length;i++){
let pass = false;
for (var j=0;j<locDetlData.length;j++){
- if (data[i].matnr === locDetlData[j].matnr && data[i].locNo$ === locDetlData[j].locNo$) {
+ if (data[i].matnr === locDetlData[j].matnr && data[i].batch === locDetlData[j].batch && data[i].locNo$ === locDetlData[j].locNo$) {
pass = true;
break;
}
@@ -172,7 +172,6 @@
} else {
data[i]["count"] = data[i]["anfme"];
}
-
}
locDetlData.push.apply(locDetlData, data);
tableIns.reload({data: locDetlData});
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 56a2355..5d835a4 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -70,7 +70,6 @@
<!-- 寰呮坊鍔� -->
<div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block">
<button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">鎼滅储</button>
- <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆</button>
</div>
</div>
</fieldset>
@@ -94,7 +93,6 @@
</body>
<script>
- var pageCurr;
function getCol() {
var cols = [
{type: 'checkbox'}
@@ -146,15 +144,6 @@
if (res.code === 403) {
top.location.href = baseUrl+"/";
}
- pageCurr=curr;
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
}
});
@@ -175,14 +164,6 @@
// 鎼滅储鏍忔悳绱簨浠�
form.on('submit(search)', function (data) {
- pageCurr = 1;
- tableReload();
- });
-
- // 鎼滅储鏍忛噸缃簨浠�
- form.on('submit(reset)', function (data) {
- pageCurr = 1;
- clearFormVal($('#search-box'));
tableReload();
});
@@ -193,39 +174,14 @@
});
})
- function tableReload(child) {
+ function tableReload() {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
searchData[this.name] = this.value;
});
locDetlTableIns.reload({
where: searchData,
- page: {
- curr: pageCurr
- },
- done: function (res, curr, count) {
- if (res.code === 403) {
- top.location.href = baseUrl+"/";
- }
- pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- locDetlTableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
- }
});
- }
-
- function clearFormVal(el) {
- $(':input', el)
- .val('')
- .removeAttr('checked')
- .removeAttr('selected');
}
</script>
</html>
--
Gitblit v1.9.1