From 01f39fcb06b8713901975153d0a893e86eca6a88 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 07 七月 2025 19:42:26 +0800 Subject: [PATCH] 33.订单历史管理里面增加单据类型选项按钮、单据类型选项按钮 34.单据管理里面增加单据状态选项按钮 35.入库订单全部都入好了,单据状态还是作业中,现在作业中的单据是可以删除的,我不小心把这个单据删除了,怎么恢复? 36.每个界面点下一页都没反应,点第二页是有变化的,之后点任何页面都没反应 37.订单明细点开后的界面改大一点 38.新增出库订单的时候可以输入客户信息(客户名称、收件人、地址、电话等),现在拣货完成后连发给谁都不知道 39.大屏播种界面对应的数量和开单数量不一致 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/interceptor/StockSortInterceptor.java | 136 ++++++++++++++++++++++---------------------- 1 files changed, 68 insertions(+), 68 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/interceptor/StockSortInterceptor.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/interceptor/StockSortInterceptor.java index f05da9e..16c15cb 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/interceptor/StockSortInterceptor.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/common/interceptor/StockSortInterceptor.java @@ -1,68 +1,68 @@ -//package com.zy.asrs.wms.common.interceptor; -// -//import com.baomidou.mybatisplus.core.toolkit.PluginUtils; -//import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; -//import org.apache.ibatis.executor.Executor; -//import org.apache.ibatis.mapping.BoundSql; -//import org.apache.ibatis.mapping.MappedStatement; -//import org.apache.ibatis.session.ResultHandler; -//import org.apache.ibatis.session.RowBounds; -// -//import java.sql.SQLException; -// -// -//public class StockSortInterceptor implements InnerInterceptor { -// -// @Override -// public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { -// // 鑾峰彇鍘熷SQL璇彞 -// String originalSql = boundSql.getSql(); -// // 鍒ゆ柇鏂规硶鏄惁涓虹壒瀹氱殑鏌ヨ鏂规硶 -// if (isSpecificQueryMethod(ms)) { -// // 娣诲姞鎺掑簭閫昏緫 -// String sql = addSort(originalSql); -// // 淇敼瀹屾垚鐨剆ql 鍐嶈缃洖鍘� -// PluginUtils.MPBoundSql mpBoundSql = PluginUtils.mpBoundSql(boundSql); -// mpBoundSql.sql(sql); -// } -// } -// -// private boolean isSpecificQueryMethod(MappedStatement ms) { -// // 妫�鏌appedStatement鐨処D浠ュ垽鏂槸鍚︿负鐗瑰畾鐨勬煡璇㈡柟娉� -// String statementId = ms.getId(); -// return statementId.equals("com.zy.asrs.wms.asrs.mapper.LocDetlMapper.getStock"); -// } -// -// private String addSort(String originalSql) { -// // 鏍规嵁闇�瑕佹坊鍔犳帓搴忛�昏緫 -// return originalSql + " ORDER BY" + isQueue(); -// } -// -// private String isQueue() { -// //鍏堣繘鍏堝嚭锛氬湪鏌ヨ搴撳瓨璁板綍鏃讹紝鎺掑簭瀛楁鎸夌収man_loc_detl琛ㄧ殑createTime鍗囧簭鎺掑簭 -// return " create_time ASC"; -// } -// -// private String isFree() { -// //璁惧绌洪棽鎯呭喌锛氫紭鍏堟煡璇㈢┖闂茬殑璁惧锛屽湪鏈夌┖闂茬殑璁惧鏃讹紝浠庣┖闂茬殑璁惧瀵瑰簲鐨勮揣鏋朵笂鏌ヨ -// //TODO -// return " create_time ASC"; -// } -// -// private String isBarcodeDesc() { -// //鎵樼洏鏈�澶у�奸檷搴忥細灏辨槸鎸夌収鎵樼洏鍙烽檷搴� -// return " barcode DESC"; -// } -// -// private String isBarcodeAsc() { -// //鎵樼洏鏈�澶у�煎崌搴忥細灏辨槸鎸夌収鎵樼洏鍙峰崌搴� -// return " barcode ASC"; -// } -// -// private String isEven() { -// // 妤煎眰鍧囧寑鍒嗗竷锛� -// //TODO -// return " barcode ASC"; -// } -// -//} +//package com.zy.asrs.wms.common.interceptor; +// +//import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +//import com.baomidou.mybatisplus.extension.plugins.inner.InnerInterceptor; +//import org.apache.ibatis.executor.Executor; +//import org.apache.ibatis.mapping.BoundSql; +//import org.apache.ibatis.mapping.MappedStatement; +//import org.apache.ibatis.session.ResultHandler; +//import org.apache.ibatis.session.RowBounds; +// +//import java.sql.SQLException; +// +// +//public class StockSortInterceptor implements InnerInterceptor { +// +// @Override +// public void beforeQuery(Executor executor, MappedStatement ms, Object parameter, RowBounds rowBounds, ResultHandler resultHandler, BoundSql boundSql) throws SQLException { +// // 鑾峰彇鍘熷SQL璇彞 +// String originalSql = boundSql.getSql(); +// // 鍒ゆ柇鏂规硶鏄惁涓虹壒瀹氱殑鏌ヨ鏂规硶 +// if (isSpecificQueryMethod(ms)) { +// // 娣诲姞鎺掑簭閫昏緫 +// String sql = addSort(originalSql); +// // 淇敼瀹屾垚鐨剆ql 鍐嶈缃洖鍘� +// PluginUtils.MPBoundSql mpBoundSql = PluginUtils.mpBoundSql(boundSql); +// mpBoundSql.sql(sql); +// } +// } +// +// private boolean isSpecificQueryMethod(MappedStatement ms) { +// // 妫�鏌appedStatement鐨処D浠ュ垽鏂槸鍚︿负鐗瑰畾鐨勬煡璇㈡柟娉� +// String statementId = ms.getId(); +// return statementId.equals("com.zy.asrs.wms.asrs.mapper.LocDetlMapper.getStock"); +// } +// +// private String addSort(String originalSql) { +// // 鏍规嵁闇�瑕佹坊鍔犳帓搴忛�昏緫 +// return originalSql + " ORDER BY" + isQueue(); +// } +// +// private String isQueue() { +// //鍏堣繘鍏堝嚭锛氬湪鏌ヨ搴撳瓨璁板綍鏃讹紝鎺掑簭瀛楁鎸夌収man_loc_detl琛ㄧ殑createTime鍗囧簭鎺掑簭 +// return " create_time ASC"; +// } +// +// private String isFree() { +// //璁惧绌洪棽鎯呭喌锛氫紭鍏堟煡璇㈢┖闂茬殑璁惧锛屽湪鏈夌┖闂茬殑璁惧鏃讹紝浠庣┖闂茬殑璁惧瀵瑰簲鐨勮揣鏋朵笂鏌ヨ +// //TODO +// return " create_time ASC"; +// } +// +// private String isBarcodeDesc() { +// //鎵樼洏鏈�澶у�奸檷搴忥細灏辨槸鎸夌収鎵樼洏鍙烽檷搴� +// return " barcode DESC"; +// } +// +// private String isBarcodeAsc() { +// //鎵樼洏鏈�澶у�煎崌搴忥細灏辨槸鎸夌収鎵樼洏鍙峰崌搴� +// return " barcode ASC"; +// } +// +// private String isEven() { +// // 妤煎眰鍧囧寑鍒嗗竷锛� +// //TODO +// return " barcode ASC"; +// } +// +//} -- Gitblit v1.9.1