From bf50baf41cce651cfaf951056e976aefc077a757 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 07 四月 2025 16:01:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/OrderController.java | 17 +++++
src/main/webapp/views/wrkMast/wrkMast.html | 2
src/main/java/com/zy/asrs/service/WrkMastService.java | 4 +
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 +-
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 10 +++
src/main/java/com/zy/common/utils/YyyyMmddUtils.java | 27 ++++++--
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 5 +
src/main/resources/mapper/WrkMastMapper.xml | 23 +++++++
src/main/webapp/static/js/order/order.js | 70 +++++++++++++++++++++++
src/main/webapp/views/order/order.html | 2
10 files changed, 153 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index bf673f9..7f24378 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -365,7 +365,22 @@
}
return R.ok();
}
-
+ @RequestMapping(value = "/order/priAdd/auth")
+ @ManagerAuth(memo = "鎵嬪姩澧炲姞璁㈠崟浼樺厛绾�")
+ @Transactional
+ public R priAdd(@RequestParam Long orderId){
+ Order order = orderService.selectById(orderId);
+ wrkMastService.orderAddPri(order.getOrderNo());
+ return R.ok();
+ }
+ @RequestMapping(value = "/order/priReduce/auth")
+ @ManagerAuth(memo = "鎵嬪姩鍑忓皯璁㈠崟浼樺厛绾�")
+ @Transactional
+ public R priReduce(@RequestParam Long orderId){
+ Order order = orderService.selectById(orderId);
+ wrkMastService.orderReducePri(order.getOrderNo());
+ return R.ok();
+ }
@RequestMapping(value = "/order/delete/auth")
@ManagerAuth(memo = "鎵嬪姩鍒犻櫎璁㈠崟")
@Transactional
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index e5009cc..2b52b39 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -4,6 +4,7 @@
import com.zy.asrs.entity.WrkMast;
import org.apache.ibatis.annotations.Insert;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -19,6 +20,10 @@
List<WrkMast> selectToBeHistoryData();
List<WrkMast> selectToBeHistoryData2();
+ int orderAddPri(@Param("orderNo") String orderNo);
+
+ int orderReducePri(@Param("orderNo") String orderNo);
+
// work log -------------------------------------------------------
@Insert("insert into asr_wrk_mast_log select * from asr_wrk_mast where wrk_no=#{workNo}")
int saveWrkMastLog(Integer workNo);
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 5b2b80c..845a916 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -25,4 +25,8 @@
int getStoreCount(Integer crnNo);
int saveWrkMastLog(Integer workNo);
+
+ int orderAddPri(String orderNo);
+
+ int orderReducePri(String orderNo);
}
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 8901eb6..f00a955 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -444,9 +444,9 @@
wrkMast.setIoTime(now);
wrkMast.setWrkSts(11L); // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- Integer pri = YyyyMmddUtils.convertPri(nowPri);
- wrkMast.setIoType(pri); // 鍏ュ嚭搴撶姸鎬�
- wrkMast.setIoPri(13D); // 浼樺厛绾э細13
+ double pri = YyyyMmddUtils.convertPriD(nowPri);
+ wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
+ wrkMast.setIoPri(pri); // 浼樺厛绾э細13
wrkMast.setCrnNo(locMast.getCrnNo());
wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 69d05b1..c1f47dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -61,4 +61,14 @@
return this.baseMapper.saveWrkMastLog(workNo);
};
+ @Override
+ public int orderAddPri(String orderNo) {
+ return this.baseMapper.orderAddPri(orderNo);
+ }
+
+ @Override
+ public int orderReducePri(String orderNo) {
+ return this.baseMapper.orderReducePri(orderNo);
+ }
+
}
diff --git a/src/main/java/com/zy/common/utils/YyyyMmddUtils.java b/src/main/java/com/zy/common/utils/YyyyMmddUtils.java
index 013ff33..fd227f3 100644
--- a/src/main/java/com/zy/common/utils/YyyyMmddUtils.java
+++ b/src/main/java/com/zy/common/utils/YyyyMmddUtils.java
@@ -53,7 +53,7 @@
}
// 鍘熸柟娉曟敼閫狅紙甯� Date 鍙傛暟锛�
- public static long convertYyyyMMdd100000ioPri(Date data) {
+ public static long convertPriL(Date data) {
long ioPri = convertYyyyMMdd100000(data);
long secondsOfDay = getSecondsOfDay(data);
System.out.println(secondsOfDay);
@@ -62,19 +62,32 @@
// 閲嶈浇鏂规硶锛堝吋瀹规棤 Date 鍙傛暟鐨勮皟鐢級
public static long convertYyyyMMdd1000000ioPri() {
- return convertYyyyMMdd100000ioPri(new Date());
+ return convertPriL(new Date());
}
// 閲嶈浇鏂规硶锛堝吋瀹规棤 Date 鍙傛暟鐨勮皟鐢級
- public static Integer convertPri(Date date) {
- long datePri = convertYyyyMMdd100000ioPri(date);
+ public static Integer convertPriI(Date date) {
+ long datePri = convertPriL(date);
return (int)datePri;
+ }
+
+ // 閲嶈浇鏂规硶锛堝吋瀹规棤 Date 鍙傛暟鐨勮皟鐢級
+ public static Double convertPriD(Date date) {
+ long datePri = convertPriL(date);
+ return (double)datePri;
}
public static void main(String[] args) {
Date now = new Date();
- long result = YyyyMmddUtils.convertYyyyMMdd100000ioPri(now);
- System.out.println("璁＄畻鍊硷細" + result);
- System.out.println("璁＄畻鍊硷細" + (int)result);
+ long resultl = YyyyMmddUtils.convertPriL(now);
+ Integer resultI= YyyyMmddUtils.convertPriI(now);
+ Double resultD = YyyyMmddUtils.convertPriD(now);
+ System.out.println("resultl璁＄畻鍊硷細" + resultl);
+ System.out.println("resultl璁＄畻鍊硷細" + (resultl+0.0));
+ System.out.println("resultl璁＄畻鍊硷細" + (double)resultl);
+ System.out.println("resultI璁＄畻鍊硷細" + resultI);
+ System.out.println("resultI璁＄畻鍊硷細" + resultI);
+ System.out.println("resultD璁＄畻鍊硷細" + resultD);
+ System.out.println("resultD璁＄畻鍊硷細" + resultD);
}
}
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index ac9d877..7875a50 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -89,4 +89,27 @@
order by io_time,wrk_no asc
</select>
+ <update id="orderAddPri">
+ UPDATE asr_wrk_mast
+ SET io_pri = io_pri + 100000
+ WHERE 1=1
+ AND wrk_no IN (
+ SELECT wrk_no
+ FROM asr_wrk_detl
+ WHERE order_no = #{orderNo}
+ );
+ </update>
+
+ <update id="orderReducePri">
+ UPDATE asr_wrk_mast
+ SET io_pri = io_pri - 100000
+ WHERE 1=1
+ AND io_pri >= 100001
+ AND wrk_no IN (
+ SELECT wrk_no
+ FROM asr_wrk_detl
+ WHERE order_no = #{orderNo}
+ );
+ </update>
+
</mapper>
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 532fc96..61318f4 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -56,7 +56,7 @@
{field: 'createTime$', title: '鍒涘缓鏃堕棿', minWidth: 200, width: 200},
{field: 'settle$', align: 'center', title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160},
{field: 'memo', align: 'center',title: '澶囨敞', hide: true},
- {align: 'center', title: '鎿嶄綔', toolbar: '#operate', width: 240}
+ {align: 'center', title: '鎿嶄綔', toolbar: '#operate'}
]],
request: {
pageName: 'curr',
@@ -168,6 +168,10 @@
showEditModel(data);
} else if (layEvent === 'wrkTrace') {
showWrkTrace(data.id);
+ } else if (layEvent === 'priAdd') {
+ priAdd(data.id);
+ } else if (layEvent === 'priReduce') {
+ priReduce(data.id);
} else if (layEvent === 'del') {
doDel(data.id);
} else if (layEvent === 'labelUp') {
@@ -529,6 +533,70 @@
}
// 鍒犻櫎鍗曟嵁
+ function priAdd(orderId) {
+ layer.confirm('纭畾瑕佸鍔犳璁㈠崟浼樺厛绾у悧锛熺偣涓�涓嬪姞100000', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/priAdd/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: orderId
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+ function priReduce(orderId) {
+ layer.confirm('纭畾瑕佸鍔犳璁㈠崟浼樺厛绾у悧锛熺偣涓�涓嬪噺100000', {
+ shade: .1,
+ skin: 'layui-layer-admin'
+ }, function (i) {
+ layer.close(i);
+ layer.load(2);
+ $.ajax({
+ url: baseUrl+"/order/priReduce/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {
+ orderId: orderId
+ },
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll('loading');
+ if (res.code === 200){
+ if (insTbCount === 0) {
+ insTb.reload({page: {curr: 1}});
+ } else {
+ $(".layui-laypage-btn")[0].click();
+ }
+ layer.msg(res.msg, {icon: 1});
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
function doDel(orderId) {
layer.confirm('纭畾瑕佸垹闄ゅ悧锛�', {
shade: .1,
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index aa5fc84..181daf7 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -132,6 +132,8 @@
{{# if (d.settle == 2) { }}
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="labelUp">涓婁紶鏍囩</a>
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="complete">瀹岀粨</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="priAdd">澧炲姞浼樺厛绾�</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="priReduce">闄嶄綆浼樺厛绾�</a>
{{# } }}
{{# if (d.settle == 4 && d.tkType=='1') { }}
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="refundLoc">閫�搴�</a>
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index 3c84201..7b1fc56 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -97,7 +97,7 @@
</div>
<script type="text/html" id="toolbar">
<div class="layui-btn-container">
- <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon"></i>sheet</button>
+<!-- <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon"></i>sheet</button>-->
<button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon"></i>澧炲姞浼樺厛绾�</button>
<button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon"></i>闄嶄綆浼樺厛绾�</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
--
Gitblit v1.9.1