From 177e192a5c47f1d6322ee7b2642239f54526aef7 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期六, 26 三月 2022 09:08:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/zy/cloud/wms/manager/controller/QualityController.java | 20 ++++++++-
src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java | 5 ++
src/main/java/zy/cloud/wms/manager/service/QualityService.java | 2
src/main/java/zy/cloud/wms/manager/service/ReceiveService.java | 2 +
src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java | 3 +
src/main/webapp/views/quality/quality.html | 6 +-
src/main/resources/mapper/ReceiveMapper.xml | 3 +
src/main/resources/mapper/QualityMapper.xml | 4 +
src/main/webapp/static/js/quality/quality.js | 1
src/main/webapp/views/receive/matQuery.html | 4 +-
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 22 ++++++++---
src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java | 1
src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java | 5 ++
src/main/webapp/static/js/receive/matRecQuery.js | 1
14 files changed, 60 insertions(+), 19 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
index 650f4f8..6d0eb4f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/QualityController.java
@@ -18,7 +18,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.manager.service.ReceiveDetlService;
+import zy.cloud.wms.manager.utils.AddZero;
+import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -91,9 +93,21 @@
@RequestMapping("/quality/orderNo/init1")
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
- SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
- String orderNo = " QC-" + String.valueOf(dateformat.format(new Date()));
- return R.ok().add(orderNo);
+ String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
+ String currNum = qualityService.getCurrNum(billNo);
+ String orderNo=null;
+ if (!Cools.isEmpty(currNum)) {
+ String[] split = currNum.split("-");
+ if (split.length < 2){
+ orderNo= billNo + "0001";
+ }
+ Integer newNum = Integer.parseInt(split[2]) +1;
+ String format = AddZero.addZeroForNum(newNum + "", 4);
+ orderNo = billNo + format;
+ }else {
+ orderNo = billNo + "0001";
+ }
+ return R.ok().add(orderNo);
}
@RequestMapping(value = "/quality/update/auth")
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 652fe69..c1f4a6d 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -16,6 +16,7 @@
import zy.cloud.wms.manager.entity.param.*;
import zy.cloud.wms.manager.entity.result.KeyValueVo;
import zy.cloud.wms.manager.service.*;
+import zy.cloud.wms.manager.utils.AddZero;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
@@ -42,6 +43,8 @@
@Autowired
private PickoutService pickoutService;
+ @Autowired
+ private ReceiveService receiveService;
@RequestMapping("/stock/pakin")
@ManagerAuth(memo = "鍏ュ簱")
public R stockPakin(@RequestBody PakinParam number) {
@@ -152,12 +155,19 @@
@RequestMapping("/orderNo/init")
@ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
public R initOrderNo() {
- long nextId = snowflakeIdWorker.nextId();
- SimpleDateFormat dateformat = new SimpleDateFormat("yyyyMMddHHmmss");
- String orderNo = "AT-" + String.valueOf(dateformat.format(new Date()));
- //String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
- if (orderService.selectByOrderNo(orderNo, getHostId()) != null) {
- return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
+ String billNo = "QC-" + new SimpleDateFormat("yyyyMMdd").format(new Date())+"-";
+ String currNum = receiveService.getCurrNum(billNo);
+ String orderNo=null;
+ if (!Cools.isEmpty(currNum)) {
+ String[] split = currNum.split("-");
+ if (split.length < 2){
+ orderNo= billNo + "0001";
+ }
+ Integer newNum = Integer.parseInt(split[2]) +1;
+ String format = AddZero.addZeroForNum(newNum + "", 4);
+ orderNo = billNo + format;
+ }else {
+ orderNo = billNo + "0001";
}
return R.ok().add(orderNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java
index 58c4a6e..7e3b611 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/QualityMapper.java
@@ -1,5 +1,6 @@
package zy.cloud.wms.manager.mapper;
+import org.apache.ibatis.annotations.Param;
import zy.cloud.wms.manager.entity.Quality;
import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
@@ -8,5 +9,5 @@
@Mapper
@Repository
public interface QualityMapper extends BaseMapper<Quality> {
-
+ String getCurrNum(@Param("billNo") String billNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java b/src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java
index 43aff65..74598ee 100644
--- a/src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java
+++ b/src/main/java/zy/cloud/wms/manager/mapper/ReceiveMapper.java
@@ -19,4 +19,5 @@
Integer getPageCount(Map<String, Object> map);
+ String getCurrNum(@Param("orderNo") String orderNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/QualityService.java b/src/main/java/zy/cloud/wms/manager/service/QualityService.java
index 10fad53..d674b63 100644
--- a/src/main/java/zy/cloud/wms/manager/service/QualityService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/QualityService.java
@@ -4,5 +4,5 @@
import com.baomidou.mybatisplus.service.IService;
public interface QualityService extends IService<Quality> {
-
+ String getCurrNum(String billNo);
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/ReceiveService.java b/src/main/java/zy/cloud/wms/manager/service/ReceiveService.java
index 0d50a03..9b3d0b7 100644
--- a/src/main/java/zy/cloud/wms/manager/service/ReceiveService.java
+++ b/src/main/java/zy/cloud/wms/manager/service/ReceiveService.java
@@ -20,4 +20,6 @@
Page<Receive> getPage(Page<Receive> page);
+ String getCurrNum(String orderNo);
+
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java
index eeb66e6..4cce3ff 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/QualityServiceImpl.java
@@ -8,5 +8,8 @@
@Service("qualityService")
public class QualityServiceImpl extends ServiceImpl<QualityMapper, Quality> implements QualityService {
-
+ @Override
+ public String getCurrNum(String billNo) {
+ return this.baseMapper.getCurrNum(billNo);
+ }
}
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java
index 3865b97..5517a59 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/ReceiveServiceImpl.java
@@ -51,5 +51,8 @@
page.setTotal(baseMapper.getPageCount(page.getCondition()));
return page;
}
-
+ @Override
+ public String getCurrNum(String orderNo) {
+ return this.baseMapper.getCurrNum(orderNo);
+ }
}
diff --git a/src/main/resources/mapper/QualityMapper.xml b/src/main/resources/mapper/QualityMapper.xml
index 76a4428..a455be9 100644
--- a/src/main/resources/mapper/QualityMapper.xml
+++ b/src/main/resources/mapper/QualityMapper.xml
@@ -16,5 +16,7 @@
<result column="create_time" property="createTime" />
</resultMap>
-
+ <select id="getCurrNum" resultType="java.lang.String">
+ SELECT top 1 bill_no FROM man_quality WHERE 1=1 AND bill_no like concat(#{billNo},'%') ORDER BY bill_no DESC
+ </select>
</mapper>
diff --git a/src/main/resources/mapper/ReceiveMapper.xml b/src/main/resources/mapper/ReceiveMapper.xml
index e8d2a7e..fa5608b 100644
--- a/src/main/resources/mapper/ReceiveMapper.xml
+++ b/src/main/resources/mapper/ReceiveMapper.xml
@@ -101,5 +101,8 @@
</if>
</sql>
+ <select id="getCurrNum" resultType="java.lang.String">
+ SELECT top 1 order_no FROM man_receive WHERE 1=1 AND order_no like concat(#{orderNo},'%') ORDER BY order_no DESC
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/quality/quality.js b/src/main/webapp/static/js/quality/quality.js
index 33657d5..a6ac4c9 100644
--- a/src/main/webapp/static/js/quality/quality.js
+++ b/src/main/webapp/static/js/quality/quality.js
@@ -78,6 +78,7 @@
switch(obj.event) {
case 'addData':
showEditModel();
+ initOrderNo1();
break;
case 'deleteData':
if (checkStatus.length === 0) {
diff --git a/src/main/webapp/static/js/receive/matRecQuery.js b/src/main/webapp/static/js/receive/matRecQuery.js
index b9ff750..b5d744d 100644
--- a/src/main/webapp/static/js/receive/matRecQuery.js
+++ b/src/main/webapp/static/js/receive/matRecQuery.js
@@ -76,6 +76,7 @@
});
}
}
+ initOrderNo();
var index = layer.load(1, {shade: [0.1,'#000']});
// 鍗曟嵁绫诲瀷
var docTypeData;
diff --git a/src/main/webapp/views/quality/quality.html b/src/main/webapp/views/quality/quality.html
index 6629a8d..9d1913b 100644
--- a/src/main/webapp/views/quality/quality.html
+++ b/src/main/webapp/views/quality/quality.html
@@ -33,7 +33,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>
+ <button class="layui-btn layui-btn-sm" id="btn-add" layui-anim-down lay-event="addData">鏂板</button>
<button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
@@ -74,7 +74,7 @@
<div class="layui-form-item">
<label class="layui-form-label">妫�楠屽崟鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="billNo" id="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�" lay-verify="required">
+ <input class="layui-input layui-disabled" readonly name="billNo" id="billNo" placeholder="璇疯緭鍏ユ楠屽崟鍙�" lay-verify="required">
</div>
</div>
<div class="layui-form-item">
@@ -134,7 +134,7 @@
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>
+<!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo1()">缂栧彿鑷姩鐢熸垚</button>-->
<button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
<button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
</div>
diff --git a/src/main/webapp/views/receive/matQuery.html b/src/main/webapp/views/receive/matQuery.html
index 6a2f793..ff412fb 100644
--- a/src/main/webapp/views/receive/matQuery.html
+++ b/src/main/webapp/views/receive/matQuery.html
@@ -162,7 +162,7 @@
<div class="layui-form-item">
<label class="layui-form-label layui-form-required">鍗曟嵁缂栧彿:</label>
<div class="layui-input-block">
- <input id="orderNo" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" class="layui-input" lay-verType="tips" lay-verify="required" autocomplete="off">
+ <input id="orderNo" name="orderNo" placeholder="璇疯緭鍏ュ崟鎹紪鍙�" readonly class="layui-input layui-disabled" lay-verType="tips" lay-verify="required" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
@@ -186,7 +186,7 @@
</div>
</div>
<div class="layui-form-item cool-button-contain">
- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo()">缂栧彿鑷姩鐢熸垚</button>
+<!-- <button class="layui-btn layui-btn-primary" id="autoNo" onclick="initOrderNo()">缂栧彿鑷姩鐢熸垚</button>-->
<button class="layui-btn layui-btn-normal" id="confirm" lay-filter="confirm" lay-submit="">纭畾</button>
</div>
</div>
--
Gitblit v1.9.1