From d6cb644d0ccc0f73f68d60b3a43e82320d8c97f0 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 23 六月 2025 08:57:04 +0800
Subject: [PATCH] 米多泉州wms功能完善
---
src/main/webapp/views/locDetl/locDetl.html | 22 ++--
src/main/resources/mapper/WrkMastLogMapper.xml | 2
src/main/java/com/zy/common/config/MyBatisPlusConfig.java | 19 +++
src/main/java/com/zy/asrs/controller/LocDetlController.java | 12 +-
src/main/resources/logback-spring.xml | 18 +++
src/main/resources/mapper/LocDetlMapper.xml | 11 +
src/main/java/com/zy/asrs/entity/WrkMast.java | 8 +
src/main/java/com/zy/asrs/task/WorkMastScheduler.java | 2
src/main/resources/mapper/WrkMastMapper.xml | 27 +++-
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 8 +
src/main/webapp/views/pakStore/locDetlQuery.html | 6
src/main/java/com/zy/common/web/WcsController.java | 14 ++
src/main/java/com/zy/asrs/task/MdqzScheduler.java | 2
src/main/webapp/static/js/locDetl/locDetl.js | 6
src/main/java/com/zy/asrs/entity/LocDetl.java | 2
src/main/java/com/zy/common/web/param/CanningLineInLocParam.java | 3
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 2
src/main/java/com/zy/common/config/SlowSqlInterceptor.java | 52 ++++++++++
src/main/java/com/zy/asrs/task/WorkLogScheduler.java | 2
src/main/webapp/static/js/common.js | 12 +-
src/main/java/com/zy/common/service/CommonService.java | 6 +
src/main/resources/application.yml | 3
23 files changed, 192 insertions(+), 49 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 6840cb7..7a7c881 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -412,12 +412,12 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
+// for (LocDetl locDetl : stockStatis.getRecords()) {
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (mat != null) {
+// locDetl.sync(mat);
+// }
+// }
return R.ok().add(stockStatis);
}
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 20b80f6..3ebf69d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -106,9 +106,11 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
+ @TableField("man_length")
private Double manLength;
@ApiModelProperty(value= "浣撶Н")
+ @TableField("volume")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 3270e75..624b6bb 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -174,7 +174,7 @@
/**
* 浣撶Н
*/
- @ApiModelProperty(value= "浣撶Н")
+ @ApiModelProperty(value= "缃愯閲�")
private Double volume;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 66dc120..bf006ec 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -342,6 +342,14 @@
@TableField("rgv_dsta_no")
private Integer rgvDstaNo;
+ @ApiModelProperty(value= "rgv鍛戒护涓嬪彂鏃堕棿")
+ @TableField("rgv_create_time")
+ private Date rgvCreateTime;
+
+ @ApiModelProperty(value= "rgv浠诲姟瀹屾垚鏃堕棿")
+ @TableField("rgv_finish_time")
+ private Date rgvFinishTime;
+
/**
* 浼寸敓宸ヤ綔鍙�
*/
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 9178269..ff96225 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -345,6 +345,14 @@
@TableField("rgv_dsta_no")
private Integer rgvDstaNo;
+ @ApiModelProperty(value= "rgv鍛戒护涓嬪彂鏃堕棿")
+ @TableField("rgv_create_time")
+ private Date rgvCreateTime;
+
+ @ApiModelProperty(value= "rgv浠诲姟瀹屾垚鏃堕棿")
+ @TableField("rgv_finish_time")
+ private Date rgvFinishTime;
+
/**
* 浼寸敓宸ヤ綔鍙�
*/
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 26ee004..779f42d 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -823,7 +823,7 @@
int workNoOther = 0;
// 鍏ュ簱 + 搴撲綅杞Щ
if ((wrkMast.getWrkSts() < 4 && wrkMast.getIoType() != 101 && wrkMast.getIoType() != 110) || (wrkMast.getWrkSts() > 10
- && wrkMast.getIoType()==11) || wrkMast.getIoType() == 10) {
+ && wrkMast.getIoType()==11) || wrkMast.getIoType() == 10 || (wrkMast.getIoType() == 3)) {
wrkMast.setWrkSts(4L);
workNoOther = wrkMast.getWorkNoOther();
// 鍑哄簱
diff --git a/src/main/java/com/zy/asrs/task/MdqzScheduler.java b/src/main/java/com/zy/asrs/task/MdqzScheduler.java
index f796f3b..f585916 100644
--- a/src/main/java/com/zy/asrs/task/MdqzScheduler.java
+++ b/src/main/java/com/zy/asrs/task/MdqzScheduler.java
@@ -27,7 +27,7 @@
@Resource
private WrkMastService wrkMastService;
- // 璇昏ˉ灏炬《閰嶇疆锛岀粰瀵瑰簲浠诲姟鍙疯ˉ灏炬《淇″彿
+ // 璇昏ˉ灏炬《閰嶇疆锛岀粰瀵瑰簲浠诲姟鍙疯ˉ灏炬《淇″彿--鏇挎崲涓哄叆搴撳鎵惧簱浣嶆椂锛屽彂鐜板墠闈㈢被鍨嬩笉涓�鏍峰崟鐫�锛岃嚜鍔ㄨˉ灏炬《
@Scheduled(cron = "0/5 * * * * ?")
private void tailFillingBuckets() {
Config config = configService.selectConfigByCode("tailFillingBuckets");
diff --git a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
index a675ccd..9aa1fdb 100644
--- a/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkLogScheduler.java
@@ -29,7 +29,7 @@
private LocMastService locMastService;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ public void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeHistoryData();
if (wrkMasts.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
index 10bffd4..ebfb840 100644
--- a/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WorkMastScheduler.java
@@ -27,7 +27,7 @@
private WorkMastHandler workMastHandler;
@Scheduled(cron = "0/3 * * * * ? ")
- private void execute(){
+ public void execute(){
List<WrkMast> wrkMasts = wrkMastService.selectToBeCompleteData();
if (wrkMasts.isEmpty()) {
return;
diff --git a/src/main/java/com/zy/common/config/MyBatisPlusConfig.java b/src/main/java/com/zy/common/config/MyBatisPlusConfig.java
new file mode 100644
index 0000000..d510d25
--- /dev/null
+++ b/src/main/java/com/zy/common/config/MyBatisPlusConfig.java
@@ -0,0 +1,19 @@
+package com.zy.common.config;
+
+/**
+ * @author pang.jiabao
+ * @description MyBaits plus sql鎷︽埅鍣ㄩ厤缃�
+ * @createDate 2024/10/25 16:18
+ */
+import org.mybatis.spring.annotation.MapperScan;
+import org.springframework.context.annotation.Bean;
+
+//@Configuration
+@MapperScan("src.resources.mapper") // 鏇挎崲涓轰綘鐨凪apper鍖呰矾寰�
+public class MyBatisPlusConfig {
+
+ @Bean
+ public SlowSqlInterceptor slowSqlInterceptor() {
+ return new SlowSqlInterceptor();
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/zy/common/config/SlowSqlInterceptor.java b/src/main/java/com/zy/common/config/SlowSqlInterceptor.java
new file mode 100644
index 0000000..fbd2307
--- /dev/null
+++ b/src/main/java/com/zy/common/config/SlowSqlInterceptor.java
@@ -0,0 +1,52 @@
+package com.zy.common.config;
+/**
+ * @author pang.jiabao
+ * @description 璁板綍鎱ql鏃ュ織
+ * @createDate 2024/10/25 16:18
+ */
+import org.apache.ibatis.executor.Executor;
+import org.apache.ibatis.mapping.MappedStatement;
+import org.apache.ibatis.plugin.*;
+import org.apache.ibatis.session.ResultHandler;
+import org.apache.ibatis.session.RowBounds;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Properties;
+
+@Intercepts({
+ @Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class}),
+ @Signature(type = Executor.class, method = "query", args = {MappedStatement.class, Object.class, RowBounds.class, ResultHandler.class})
+})
+public class SlowSqlInterceptor implements Interceptor {
+
+ private static final Logger logger = LoggerFactory.getLogger(com.zy.common.config.SlowSqlInterceptor.class);
+
+ @Override
+ public Object intercept(Invocation invocation) throws Throwable {
+ MappedStatement ms = (MappedStatement) invocation.getArgs()[0];
+ String sqlId = ms.getId(); // 鑾峰彇 SQL ID
+ // 鑾峰彇 SQL 璇彞锛屽彲浠ョ敤 sqlSource
+ String sql = ms.getBoundSql(invocation.getArgs()[1]).getSql(); // 鑾峰彇鍏蜂綋鐨� SQL 璇彞
+
+ long startTime = System.currentTimeMillis();
+ Object result = invocation.proceed();
+ long duration = System.currentTimeMillis() - startTime;
+
+ if (duration > 500) { // 闃堝��
+ logger.warn("鎱QL: {}锛屾墽琛屾椂闂�: {}姣锛屽叿浣揝QL: {}", sqlId, duration, sql);
+ }
+
+ return result;
+ }
+
+ @Override
+ public Object plugin(Object o) {
+ return Plugin.wrap(o, this);
+ }
+
+ @Override
+ public void setProperties(Properties properties) {
+
+ }
+}
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index cd5c552..fc0c51e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -315,6 +315,12 @@
}
locMast = locMastList.get(0);
} else { // 濂囨暟锛屼笉鍙互鍏ュ簱
+ // 鑷姩缁欏墠闈换鍔¤ˉ灏炬《淇″彿
+ if (wrkMast.getCtnType() == 0) {
+ wrkMast.setCtnType(1);
+ wrkMastService.updateById(wrkMast);
+ log.info("鑷姩琛ュ熬妗朵俊鍙锋垚鍔�,浠诲姟鍙凤細{}",wrkMast.getCtnType());
+ }
log.error("-----涓庡墠闈㈡《绫诲瀷涓嶄竴鏍凤紝鍓嶉潰妗朵笉鏄熬妗讹紝鍓嶉潰璇ユ《绫诲瀷浠诲姟鏁颁笉鏄伓鏁帮紝涓嶈兘鍏ュ簱----");
throw new CoolException("涓庡墠闈㈡《绫诲瀷涓嶄竴鏍凤紝鍓嶉潰妗朵笉鏄熬妗讹紝鍓嶉潰璇ユ《绫诲瀷浠诲姟鏁颁笉鏄伓鏁帮紝涓嶈兘鍏ュ簱");
}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 8230f84..e070559 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -8,6 +8,7 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.EmptyPlateOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.WrkMastMapper;
@@ -281,6 +282,7 @@
// wrkDetl.setManuDate(param.getManuDate());
// wrkDetl.setWeight(param.getWeight());
// wrkDetl.setManLength(param.getGrossWeight());
+// wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
// wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
// wrkDetl.setIoTime(now);
// wrkDetl.setAppeTime(now);
@@ -325,6 +327,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume()); // 缃愯閲�
wrkDetl.setInspect(1);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -378,6 +381,7 @@
wrkDetl.setManuDate(param.getManuDate());
wrkDetl.setWeight(param.getWeight());
wrkDetl.setManLength(param.getGrossWeight());
+ wrkDetl.setVolume(param.getCannedVolume());
wrkDetl.setInspect(1); // 璐存爣鎴愬姛
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
@@ -671,6 +675,14 @@
return wrkMastService.insert(wrkMast) ? R.ok("鑷姩绌烘墭鍏ュ簱鎴愬姛,宸ヤ綔鍙�:"+wrkMast.getWrkNo()) : R.error("鐢熸垚鑷姩绌烘墭鍏ュ簱澶辫触");
}
+ // 鑷姩鍑虹┖妗�
+ @PostMapping("/autoOutEmptyBucket")
+ @ResponseBody
+ public R autoOutEmptyBucket(@RequestBody StockOutParam param){
+ workService.startupFullTakeStore(param, 29L);
+ return R.ok("鍑哄簱鍚姩鎴愬姛");
+ }
+
@PostMapping("auto/emptyOut/v1")
@ResponseBody
public R autoEmptyOut(@RequestBody Map<String,String> emptyPalletSite){
@@ -871,7 +883,7 @@
wrkMast.setIoTime(new Date());
wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
wrkMast.setIoType(10); // 鍏ュ嚭搴撶姸鎬侊細10.绌烘澘鍏ュ簱
- wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setIoPri(14D); // 浼樺厛绾�
wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(dto.getSourceStaNo());
wrkMast.setStaNo(dto.getStaNo());
diff --git a/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java b/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
index 614101e..c94ca58 100644
--- a/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
+++ b/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
@@ -31,6 +31,9 @@
// 澶嶆鍚堟牸鍚�
private boolean reinspection;
+ // 缃愯閲�
+ private double cannedVolume;
+
// 婧愮珯鐐�
private Integer sourceStaNo;
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4dd548a..47fa2fd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -27,7 +27,8 @@
mybatis-plus:
mapper-locations: classpath:mapper/*.xml
-
+# configuration:
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
logging:
path: /stock/out/@pom.build.finalName@/logs
diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml
index f72c762..73de2ac 100644
--- a/src/main/resources/logback-spring.xml
+++ b/src/main/resources/logback-spring.xml
@@ -18,7 +18,23 @@
<charset>UTF-8</charset>
</encoder>
</appender>
-
+ <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
+ <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+ <level>WARN</level>
+ </filter>
+ <file>${LOG_PATH}/warn.log</file>
+ <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+ <FileNamePattern>${LOG_PATH}/warn_%d{yyyy-MM-dd}.%i.log</FileNamePattern>
+ <maxHistory>10</maxHistory>
+ <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+ <maxFileSize>10MB</maxFileSize>
+ </timeBasedFileNamingAndTriggeringPolicy>
+ </rollingPolicy>
+ <encoder>
+ <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{35} - %msg %n</pattern>
+ <charset>UTF-8</charset>
+ </encoder>
+ </appender>
<!--info绾у埆-->
<appender name="INFO_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>${LOG_PATH}/info.log</file>
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 958190a..e32c42d 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -374,12 +374,14 @@
select
ROW_NUMBER() over (order by sum(a.anfme) desc) as row
, a.matnr
- , a.batch
+ , a.maktx
+ , a.model
+ , a.volume
, sum(a.anfme) as anfme
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr, a.batch
+ group by a.matnr,a.maktx,a.model,a.volume
) t where t.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -388,10 +390,13 @@
(
select
a.matnr
+ , a.maktx
+ , a.model
+ , a.volume
from asr_loc_detl a
where 1=1
<include refid="stockOutCondition"></include>
- group by a.matnr
+ group by a.matnr, a.maktx, a.model,a.volume
) b
</select>
diff --git a/src/main/resources/mapper/WrkMastLogMapper.xml b/src/main/resources/mapper/WrkMastLogMapper.xml
index a1db83a..c1dcaa2 100644
--- a/src/main/resources/mapper/WrkMastLogMapper.xml
+++ b/src/main/resources/mapper/WrkMastLogMapper.xml
@@ -64,6 +64,8 @@
<result column="rgv_no" property="rgvNo" />
<result column="rgv_ssta_no" property="rgvSstaNo" />
<result column="rgv_dsta_no" property="rgvDstaNo" />
+ <result column="rgv_create_time" property="rgvCreateTime" />
+ <result column="rgv_finish_time" property="rgvFinishTime" />
<result column="work_no_other" property="workNoOther" />
<result column="Pdc_type" property="pdcType" />
</resultMap>
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index 5f7ca5b..f0de5cb 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -63,6 +63,8 @@
<result column="rgv_no" property="rgvNo" />
<result column="rgv_ssta_no" property="rgvSstaNo" />
<result column="rgv_dsta_no" property="rgvDstaNo" />
+ <result column="rgv_create_time" property="rgvCreateTime" />
+ <result column="rgv_finish_time" property="rgvFinishTime" />
<result column="work_no_other" property="workNoOther" />
<result column="Pdc_type" property="pdcType" />
</resultMap>
@@ -72,12 +74,19 @@
</select>
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
- select * from asr_wrk_mast
- where wrk_sts=5 and dateadd(mi,1,modi_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp)
- or (wrk_sts=15 and ove_mk='Y' and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and dateadd(mi,1,modi_time) <= getdate() and wrk_no not in (select wrk_no from asr_bas_devp))
- or (wrk_sts=15 and crn_end_time is null and wrk_no not in (select wrk_no from asr_bas_devp))
- order by io_time,wrk_no asc
+ SELECT a.*
+ FROM asr_wrk_mast a
+ LEFT JOIN asr_bas_devp b ON a.wrk_no = b.wrk_no
+ WHERE b.wrk_no IS NULL
+ AND (
+ (a.wrk_sts = 5 AND a.modi_time < DATEADD(mi, -1, GETDATE()))
+ OR
+ (a.wrk_sts = 15 AND (
+ a.ove_mk = 'Y' OR
+ a.modi_time <= DATEADD(mi, -1, GETDATE()) OR
+ a.crn_end_time IS NULL
+ ))
+ ) OPTION (RECOMPILE)
</select>
<select id="selectWrkMastWrkDetl" resultMap="BaseResultMap">
@@ -157,16 +166,16 @@
</select>
<select id="selectInGzxCount" resultType="java.lang.Integer">
SELECT
- count(m.wrk_no)
+ count(DISTINCT m.wrk_no)
FROM
asr_wrk_mast m
LEFT JOIN asr_bas_devp d ON
m.wrk_no = d.wrk_no
WHERE
- (m.wrk_sts IN (2, 9)
+ (m.wrk_sts IN (2, 9 ,10,14)
AND m.sta_no = #{site}
AND d.wrk_no IS NOT NULL)
- OR (m.wrk_sts = 10
+ OR (m.wrk_sts IN(10,11,12,14)
AND m.sta_no = #{site}
AND d.wrk_no IS NULL)
</select>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index dbf9993..29817cd 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -224,16 +224,16 @@
var detlCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
- ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true, hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'model', align: 'center',title: '妗跺瀷', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
@@ -245,7 +245,7 @@
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍑�閲�', hide: true}
,{field: 'manLength', align: 'center',title: '姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'volume', align: 'center',title: '缃愯閲�', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 2a744f7..343715e 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -21,13 +21,13 @@
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: false}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍑�閲�'}
- ,{field: 'man_length', align: 'center',title: '姣涢噸'}
+ ,{field: 'manLength', align: 'center',title: '姣涢噸'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ ,{field: 'volume', align: 'center',title: '缃愯閲�', hide: false}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index d5a134f..573e118 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -39,7 +39,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="鎵瑰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="volume" placeholder="缃愯閲�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -52,16 +52,16 @@
<input class="layui-input" type="text" name="model" placeholder="妗跺瀷" autocomplete="off">
</div>
</div>
- <div class="layui-inline">
- <div class="layui-input-inline">
- <select name="frozen" class="layui-input" type="text" autocomplete="off">
- <!-- <option style="display: none"></option>-->
- <option value="">鍐荤粨鍚�</option>
- <option value="0">鏈喕缁�</option>
- <option value="1">宸插喕缁�</option>
- </select>
- </div>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <div class="layui-input-inline">-->
+<!-- <select name="frozen" class="layui-input" type="text" autocomplete="off">-->
+<!-- <!– <option style="display: none"></option>–>-->
+<!-- <option value="">鍐荤粨鍚�</option>-->
+<!-- <option value="0">鏈喕缁�</option>-->
+<!-- <option value="1">宸插喕缁�</option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
<!-- <div class="layui-inline">-->
<!-- <div class="layui-input-inline">-->
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 51186ed..4b9f90f 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -64,17 +64,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="瑙勬牸" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="妗跺瀷" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鎻忚堪" autocomplete="off">
+ <input class="layui-input" type="text" name="volume" placeholder="缃愯閲�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1