From b435ec06d5392d2658a176dd962e3ff503a8acf3 Mon Sep 17 00:00:00 2001
From: whycq <123456>
Date: 星期二, 01 十一月 2022 14:27:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/webapp/views/locDetl/locDetl.html | 2
version/边锋数据库改动20221028/边锋数据库改动.md | 6 +
src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java | 4 +
src/main/java/com/zy/asrs/controller/LocMastController.java | 4 +
src/main/resources/mapper/LocDetlMapper.xml | 14 +-
src/main/resources/mapper/LocMastMapper.xml | 42 ++++++++++
src/main/webapp/static/js/stoMan/stoQue.js | 1
src/main/webapp/views/locMast/locMast_detail.html | 11 ++
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 91 +++++++++++++++-------
src/main/java/com/zy/asrs/mapper/LocMastMapper.java | 1
src/main/webapp/static/js/locMast/locMast.js | 6
src/main/java/com/zy/asrs/entity/LocMast.java | 11 ++
src/main/java/com/zy/asrs/service/LocMastService.java | 1
src/main/java/com/zy/common/service/CommonService.java | 8 +
src/main/resources/application.yml | 4
15 files changed, 163 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index 96adfe8..58a0432 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -107,6 +107,10 @@
return R.error();
}
+ if (!locMast.getLocSts().equals("F") && !Cools.isEmpty(locMast.getFrozen()) && locMast.getFrozen() == 1) {
+ return R.error("搴撳瓨鍦ㄥ簱鐘舵�佹墠鑳藉喕缁�");
+ }
+
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
.eq("source_loc_no", locMast.getLocNo())
.or().eq("loc_no", locMast.getLocNo()));
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index cd5f3ba..ccb8433 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -295,4 +295,15 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
+ public String getFrozen$() {
+ if (null == this.frozen){ return null; }
+ switch (this.frozen){
+ case 0:
+ return "";
+ case 1:
+ return "宸插喕缁�";
+ default:
+ return null;
+ }
+ }
}
diff --git a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
index da9fcbc..5d6b3fb 100644
--- a/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/LocMastMapper.java
@@ -14,6 +14,7 @@
public interface LocMastMapper extends BaseMapper<LocMast> {
List<LocMast> queryFreeLocMast(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1);
+ List<LocMast> queryFreeLocMast2(@Param("rows") List<Integer> rows, @Param("rowsLen") Integer rowsLen, @Param("locType1") Short locType1, @Param("inoutEveryday") Boolean inoutEveryday);
@Select("select loc_no from asr_loc_mast where 1=1 and loc_sts = 'O' and crn_no = #{crnNo}")
List<String> queryGroupEmptyStock(Integer crnNo);
diff --git a/src/main/java/com/zy/asrs/service/LocMastService.java b/src/main/java/com/zy/asrs/service/LocMastService.java
index f54455b..8983351 100644
--- a/src/main/java/com/zy/asrs/service/LocMastService.java
+++ b/src/main/java/com/zy/asrs/service/LocMastService.java
@@ -12,6 +12,7 @@
* 妫�绱㈠彲鐢ㄥ簱浣�
*/
List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1);
+ List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday);
/**
* 鑾峰彇鍚岀粍璐ф灦鐨勭┖搴撲綅
diff --git a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
index ec77dd4..5ba6512 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocMastServiceImpl.java
@@ -30,6 +30,10 @@
public List<LocMast> queryFreeLocMast(List<Integer> rows, Integer rowsLen, Short locType1) {
return this.baseMapper.queryFreeLocMast(rows, rowsLen, locType1);
}
+ @Override
+ public List<LocMast> queryFreeLocMast2(List<Integer> rows, Integer rowsLen, Short locType1,Boolean inoutEveryday) {
+ return this.baseMapper.queryFreeLocMast2(rows, rowsLen, locType1,inoutEveryday);
+ }
@Override
public List<String> queryGroupEmptyStock(String sourceLocNo) {
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 240c057..88c59d7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -360,21 +360,32 @@
// 淇敼璁㈠崟鏄庣粏
if (BaseController.isJSON(locDto.getOrderNo())) {
String[] orderNos = GetOrderNo(locDto.getOrderNo());
- Double anfme = locDto.getAnfme();
- for (String orderNo : orderNos) {
- OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
- if (orderDetl == null) {
- orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ if (!Cools.isEmpty(orderNos)){
+ Double anfme = locDto.getAnfme();
+ for (String orderNo : orderNos) {
+ OrderDetl orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(orderNo, locDto.getMatnr(), null);
+ }
+ if (orderDetl.getAnfme() <= anfme) {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ anfme = anfme - orderDetl.getAnfme();
+ } else {
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
+ }
+ }
+ orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
- if (orderDetl.getAnfme() <= anfme) {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), orderDetl.getAnfme())) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
- anfme = anfme - orderDetl.getAnfme();
- } else {
- if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), anfme)) {
- throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
- }
+ }else {
+ OrderDetl orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), locDto.getBatch());
+ if (orderDetl == null) {
+ orderDetl = orderDetlService.selectItem(locDto.getOrderNo(), locDto.getMatnr(), null);
+ }
+ if (!orderDetlService.increase(orderDetl.getOrderId(), orderDetl.getMatnr(), orderDetl.getBatch(), locDto.getAnfme())) {
+ throw new CoolException("淇敼璁㈠崟鏄庣粏鏁伴噺澶辫触");
}
orderService.updateSettle(orderDetl.getOrderId(), 2L, userId);
}
@@ -410,14 +421,18 @@
private String[] GetOrderNo(String orderNo) {
String[] s3 = orderNo.split("\"");
String[] s = new String[(s3.length - 1) / 6];
- int i = 0;
- int j = 0;
- for (String ss : s3) {
- if (ss.equals("orderNo")) {
- s[i] = s3[j + 2];
- i++;
+ if (!Cools.isEmpty(s3)){
+ int i = 0;
+ int j = 0;
+ for (String ss : s3) {
+ if (ss.equals("orderNo")) {
+ s[i] = s3[j + 2];
+ i++;
+ }
+ j++;
}
- j++;
+ }else {
+ s=null;
}
return s;
}
@@ -884,15 +899,33 @@
// 璁㈠崟鍏宠仈
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
for (WrkDetl wrkDetl : wrkDetls) {
- String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
- String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
- int i = 0;
- for (String orderNo : orderNos) {
- if (!Cools.isEmpty(orderNo)) {
- Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
- i++;
+ if (!Cools.isEmpty(wrkDetl.getOrderNo())){
+ String[] orderNos = GetOrderNo(wrkDetl.getOrderNo());
+ if (!Cools.isEmpty(orderNos)){
+ String[] anfmes = GetAnfme(wrkDetl.getOrderNo());
+ int i = 0;
+ for (String orderNo : orderNos) {
+ if (!Cools.isEmpty(orderNo)) {
+ Double anfme = Integer.parseInt(anfmes[i]) + 0.0;
+ i++;
+ if (BaseController.isJSON(wrkDetl.getOrderNo())) {
+ if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ } else {
+ // 璁㈠崟鍚堝苟鍑哄簱
+ List<OrderDto> orderDtoList = JSON.parseArray(wrkDetl.getOrderNo(), OrderDto.class);
+ for (OrderDto orderDto : orderDtoList) {
+ if (!orderDetlService.decrease(orderDto.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), orderDto.getAnfme())) {
+ throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
+ }
+ }
+ }
+ }
+ }
+ }else {
if (BaseController.isJSON(wrkDetl.getOrderNo())) {
- if (!orderDetlService.decrease(orderNo, wrkDetl.getMatnr(), wrkDetl.getBatch(), anfme)) {
+ if (!orderDetlService.decrease(wrkDetl.getOrderNo(), wrkDetl.getMatnr(), wrkDetl.getBatch(), wrkDetl.getAnfme())) {
throw new CoolException("璁㈠崟鏁版嵁鍥炴粴澶辫触");
}
} else {
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 40639a2..fedfe28 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -55,6 +55,8 @@
private LocDetlService locDetlService;
@Autowired
private SlaveProperties slaveProperties;
+ @Autowired
+ private MatService matService;
/**
* 鐢熸垚宸ヤ綔鍙�
@@ -274,7 +276,11 @@
if (locMast == null) {
List<Integer> rows = Utils.getGroupLoc(curRow);
- List<LocMast> locMasts = locMastService.queryFreeLocMast(rows, rows.size(), locTypeDto.getLocType1());
+ Mat mat = matService.selectByMatnr(matNos.get(0));
+ if (Cools.isEmpty(mat.getInoutEveryday())){
+ mat.setInoutEveryday(false);
+ }
+ List<LocMast> locMasts = locMastService.queryFreeLocMast2(rows, rows.size(), locTypeDto.getLocType1(),mat.getInoutEveryday());
if (!Cools.isEmpty(locMasts)) {
Integer innermostRow = Utils.getInnermostRow(locMasts.get(0).getLocNo());
for (LocMast one : locMasts) {
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 180b469..5114c81 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -11,8 +11,8 @@
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
# url: jdbc:sqlserver://10.10.10.100:1433;databasename=bfasrs
- url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
-# url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
+# url: jdbc:sqlserver://localhost:1433;databasename=bfasrs
+ url: jdbc:sqlserver://192.168.4.15:1433;databasename=bfasrs
username: sa
# password: Zoneyung@zy56$
password: sa@123
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 56989cd..65c7636 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -236,7 +236,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 1
and b.row1 <= 3
@@ -249,7 +249,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 4
and b.row1 <= 7
@@ -262,7 +262,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 8
and b.row1 <= 11
@@ -275,7 +275,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 12
and b.row1 <= 14
@@ -288,7 +288,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 15
and b.row1 <= 18
@@ -301,7 +301,7 @@
from asr_loc_detl a
left join asr_loc_mast b on a.loc_no = b.loc_no
where 1=1
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
and a.matnr = #{matnr}
and b.row1 >= 19
and b.row1 <= 21
@@ -364,7 +364,7 @@
)
and a.matnr = #{matnr}
and b.bay1 = #{bay}
- and b.loc_sts = 'F'
+ and b.loc_sts = 'F' and b.frozen != 1
order by b.row1 asc
</select>
diff --git a/src/main/resources/mapper/LocMastMapper.xml b/src/main/resources/mapper/LocMastMapper.xml
index 12a1b11..1a5218e 100644
--- a/src/main/resources/mapper/LocMastMapper.xml
+++ b/src/main/resources/mapper/LocMastMapper.xml
@@ -77,4 +77,46 @@
)
</select>
+ <select id="queryFreeLocMast2" resultMap="BaseResultMap">
+ select
+ *
+ from asr_loc_mast
+ where 1=1
+ <if test="inoutEveryday == false ">
+ and bay1 > 10
+ </if>
+ <if test="inoutEveryday == true">
+ and bay1 < 11
+ </if>
+ and row1 in
+ <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and ctn_no =
+ (
+ select
+ top 1
+ ctn_no
+ from (
+ select
+ ctn_no,
+ count(1) as count
+ from asr_loc_mast
+ where 1=1
+ and row1 in
+ <foreach item="item" collection="rows" index="index" separator="," open="(" close=")">
+ #{item}
+ </foreach>
+ and loc_sts = 'O'
+ <if test="locType1 != null">
+ and loc_type1 = #{locType1}
+ </if>
+ and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
+ group by ctn_no
+ ) a
+ where count = #{rowsLen}
+ order by right(ctn_no, 2) + 0 asc, left(ctn_no, 3) + 0 asc
+ )
+ </select>
+
</mapper>
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index 1bb10e3..7f3f779 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -27,7 +27,7 @@
// ,{field: 'ctnType', align: 'center',title: ''}
// ,{field: 'locSts', align: 'center',title: ''}
// ,{field: 'sheetNo', align: 'center',title: ''}
- ,{field: 'frozen', align: 'center',title: '鍐荤粨鐘舵��'}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�', sort:true}
,{field: 'bay1', align: 'center',title: '鍒�', sort:true}
@@ -57,7 +57,7 @@
,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
-
+ // ,{field: 'frozen$', align: 'center',title: '鏄惁鍐荤粨'}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:100}
]],
request: {
@@ -460,7 +460,7 @@
barcode: $('#barcode').val(),
PdcType: $('#PdcType').val(),
ctnNo: $('#ctnNo').val(),
-
+ frozen: $('#frozen').val()
};
$.ajax({
url: baseUrl+"/locMast/"+name+"/auth",
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index a4630e5..3f61c80 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -39,6 +39,7 @@
html += "disabled='disabled' >";
return html;
},width:80}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鐘舵��'}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', width: 180}
,{ fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate'}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index dad6b6c..bc4604c 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -45,7 +45,7 @@
<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>
- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>
+<!-- <button id="unreason" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="unreason">鏌ョ湅寮傚父鏁版嵁</button>-->
</div>
</div>
diff --git a/src/main/webapp/views/locMast/locMast_detail.html b/src/main/webapp/views/locMast/locMast_detail.html
index 1e12d40..fe5203c 100644
--- a/src/main/webapp/views/locMast/locMast_detail.html
+++ b/src/main/webapp/views/locMast/locMast_detail.html
@@ -77,6 +77,17 @@
<input id="sheetNo" class="layui-input" type="text">
</div>
</div>
+ <!-- 鍐荤粨 -->
+ <div class="layui-inline" style="width:80%;">
+ <label class="layui-form-label">鍐荤粨</label>
+ <div class="layui-input-inline">
+ <select id="frozen" name="frozen">
+ <option style="display: none"></option>
+ <option value="0">鏈喕缁�</option>
+ <option value="1">鍐荤粨</option>
+ </select>
+ </div>
+ </div>
<div class="layui-inline" style="width:80%;">
<label class="layui-form-label">鍫嗗灈鏈哄彿锛�</label>
<div class="layui-input-inline">
diff --git "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md" "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
index 1190b54..f64e0f4 100644
--- "a/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
+++ "b/version/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\25020221028/\350\276\271\351\224\213\346\225\260\346\215\256\345\272\223\346\224\271\345\212\250.md"
@@ -23,3 +23,9 @@
asr_check_record
```
+鏂板鍐荤粨瀛楁frozen int 榛樿鍊�0
+缁勬墭妗ｏ細鍏ュ簱閫氱煡妗�/鍘嗗彶妗ｈ〃
+宸ヤ綔涓绘。/鍘嗗彶妗�
+搴撳瓨妗�
+宸叉湁搴撳瓨鏁版嵁闇�瑕佸垵濮嬪寲frozen鍊间负0
+
--
Gitblit v1.9.1