From 65521a81a3c10a18bba7a48d58f202545ce9742d Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 16 六月 2025 14:57:50 +0800
Subject: [PATCH] wms优化
---
src/main/webapp/static/js/locDetl/locDetl.js | 24 +++--
src/main/webapp/views/locDetl/locDetl.html | 14 +++
src/main/java/com/zy/common/web/param/SearchLocParam.java | 3
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 | 3
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 5 +
src/main/resources/mapper/WrkMastMapper.xml | 19 ++++
src/main/java/com/zy/common/web/WcsController.java | 106 +++++++++++++++++++++++---
src/main/webapp/static/js/common.js | 4
src/main/java/com/zy/asrs/controller/WorkController.java | 7 +
src/main/java/com/zy/asrs/task/MdqzScheduler.java | 43 ++++++++++
12 files changed, 200 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6de7c6e..4e32659 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -56,6 +56,13 @@
Map<String, Object> map = new HashMap<>();
map.put("siteId", siteId);
map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+ if(siteId == 1071) {
+ map.put("desc", siteId + "锛堜竴鍙风亴瑁呯嚎锛�");
+ } else if(siteId == 1064) {
+ map.put("desc", siteId + "锛堜簩鍙风亴瑁呯嚎锛�");
+ } else if(siteId == 1078) {
+ map.put("desc", siteId + "锛堜笁鍙风亴瑁呯嚎锛�");
+ }
result.add(map);
}
List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 129453c..20b80f6 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -106,7 +106,7 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 3f3c399..00b9ffb 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -30,4 +30,9 @@
*/
List<WrkMast> selectLastInEmptyLoc();
+ /**
+ * 鏌ヨ鍏ョ亴瑁呯嚎绔欑偣鍦ㄩ�斾换鍔℃暟锛堟湭杩涚綈瑁呯嚎閲岄潰锛�
+ * @param site 鍏ョ綈瑁呯嚎绔欑偣
+ */
+ int selectInGzxCount(@Param("site") int site);
}
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 e9920df..26ee004 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -822,7 +822,8 @@
// 瀹屾垚绌烘《搴撳叆鍑哄簱浠诲姟鍙︿竴涓换鍔�
int workNoOther = 0;
// 鍏ュ簱 + 搴撲綅杞Щ
- if ((wrkMast.getWrkSts() < 4 && wrkMast.getIoType() != 101 && wrkMast.getIoType() != 110) || (wrkMast.getWrkSts() > 10 && wrkMast.getIoType()==11)) {
+ if ((wrkMast.getWrkSts() < 4 && wrkMast.getIoType() != 101 && wrkMast.getIoType() != 110) || (wrkMast.getWrkSts() > 10
+ && wrkMast.getIoType()==11) || wrkMast.getIoType() == 10) {
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
new file mode 100644
index 0000000..f796f3b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/task/MdqzScheduler.java
@@ -0,0 +1,43 @@
+package com.zy.asrs.task;
+
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.service.WrkMastService;
+import com.zy.system.entity.Config;
+import com.zy.system.service.ConfigService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author pang.jiabao
+ * @description 绫冲娉夊窞涓撶敤瀹氭椂浠诲姟
+ * @createDate 2024/7/10 9:20
+ */
+@Slf4j
+@Component
+public class MdqzScheduler {
+
+ @Resource
+ private ConfigService configService;
+
+ @Resource
+ private WrkMastService wrkMastService;
+
+ // 璇昏ˉ灏炬《閰嶇疆锛岀粰瀵瑰簲浠诲姟鍙疯ˉ灏炬《淇″彿
+ @Scheduled(cron = "0/5 * * * * ?")
+ private void tailFillingBuckets() {
+ Config config = configService.selectConfigByCode("tailFillingBuckets");
+ if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", config.getValue()));
+ if (wrkMast != null && wrkMast.getCtnType() == 0) {
+ wrkMast.setCtnType(1);
+ wrkMastService.updateById(wrkMast);
+ }
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 78c0638..8230f84 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -10,6 +10,7 @@
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
+import com.zy.asrs.mapper.WrkMastMapper;
import com.zy.asrs.service.*;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
@@ -63,6 +64,9 @@
@Resource
private ConfigService configService;
+ @Resource
+ private WrkMastMapper wrkMastMapper;
+
@PostMapping("/pakin/loc/v1")
@ResponseBody
@Transactional
@@ -90,6 +94,11 @@
StartupDto dto = null;
+ // 鍏ュ簱鏈夊紓甯稿嚭鍒板嚭搴撳彛1024
+ if(!Cools.isEmpty(param.getErrMsg())){
+ return exceptionIsOutOfTheWarehouse(param,sourceStaNo,waitPakin);
+ }
+
if(param.getIoType() == 1) {
List<SearchLocParam.WantBucket> wantBucketFlag = param.getWantBucketFlag();
for(SearchLocParam.WantBucket wantBucket: wantBucketFlag) {
@@ -97,8 +106,10 @@
if(waitPakin == null) {
return R.error("鍏ュ簱閫氱煡妗ｄ负绌�");
} else {
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("wrk_sts", 2).eq("sta_no", wantBucket.getSite()));
- if(wantBucket.getSite() == 1071 && count < 12 || wantBucket.getSite() == 1064 && count < 10 || wantBucket.getSite() == 1078 && count < 12) {
+ // <4 < 2 < 4
+ int count = wrkMastMapper.selectInGzxCount(wantBucket.getSite());
+// int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wantBucket.getSite()));
+ if(wantBucket.getSite() == 1071 && count < 4 || wantBucket.getSite() == 1064 && count < 2 || wantBucket.getSite() == 1078 && count < 4) {
dto = startupFullPutStore(param,waitPakin,wantBucket); // 鐩翠緵缃愯绾夸换鍔�
if (dto != null) {
log.info("WCS鍏ュ簱鐩翠緵缃愯绾挎帴鍙ｈ繑鍙�:{},鎵樼洏鐮�:{}", dto, param.getBarcode());
@@ -132,6 +143,73 @@
return R.ok().add(dto);
}
+ /**
+ * 鍏ュ簱寮傚父鍑哄埌鍑哄簱鍙�1024
+ */
+ @Transactional(propagation = Propagation.REQUIRED)
+ public R exceptionIsOutOfTheWarehouse(SearchLocParam param, BasDevp sourceStaNo,WaitPakin waitPakin) {
+
+ StartupDto dto = commonService.getLocNo(param,1024);
+ int workNo = dto.getWorkNo();
+ Date now = new Date();
+ // 鐢熸垚宸ヤ綔妗�
+ WrkMast wrkMast = new WrkMast();
+ wrkMast.setWrkNo(workNo);
+ wrkMast.setIoTime(now);
+ wrkMast.setWrkSts(2L);
+ wrkMast.setIoType(3); // 鍏ュ嚭搴撶姸鎬侊細3.绔欏埌绔�
+ wrkMast.setIoPri(13D); // 浼樺厛绾�
+ wrkMast.setSourceStaNo(dto.getSourceStaNo());
+ wrkMast.setStaNo(dto.getStaNo());
+ wrkMast.setBarcode(param.getBarcode()); // 鎵樼洏鐮�
+ wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
+ wrkMast.setPicking("N"); // 鎷ｆ枡
+ wrkMast.setExitMk("N"); // 閫�鍑�
+ wrkMast.setEmptyMk("N"); // 绌烘澘
+ wrkMast.setLinkMis("Y");
+ wrkMast.setCtnType(0); // 灏炬墭鏍囪瘑
+ wrkMast.setPdcType(waitPakin != null ? waitPakin.getMaktx() : ""); // 绌烘《绫诲瀷
+ // 鎿嶄綔浜哄憳鏁版嵁
+ wrkMast.setAppeTime(now);
+ wrkMast.setModiTime(now);
+ wrkMast.setLocNo(param.getErrMsg()); // 寮傚父鎻忚堪浣撶幇鍦ㄧ洰鏍囧簱浣嶄笂
+ boolean res = wrkMastService.insert(wrkMast);
+ if (!res) {
+ throw new CoolException("淇濆瓨宸ヤ綔妗ｅけ璐�");
+ }
+ // 鐢熸垚宸ヤ綔妗ｆ槑缁�
+ if(waitPakin != null) {
+ WrkDetl wrkDetl = new WrkDetl();
+ wrkDetl.sync(waitPakin);
+ wrkDetl.setWrkNo(wrkMast.getWrkNo());
+ wrkDetl.setIoTime(wrkMast.getIoTime());
+ wrkDetl.setAppeTime(now);
+ wrkDetl.setModiTime(now);
+ if (!wrkDetlService.insert(wrkDetl)) {
+ throw new CoolException("淇濆瓨宸ヤ綔鏄庣粏澶辫触");
+ }
+ // 鏇存柊鍏ュ簱閫氱煡妗� ioStatus ===>> Y
+ Wrapper<WaitPakin> wrapper = new EntityWrapper<WaitPakin>()
+ .eq("zpallet", param.getBarcode());
+ WaitPakin setParam = new WaitPakin();
+ setParam.setLocNo(dto.getLocNo());
+ setParam.setIoStatus("Y");
+ setParam.setModiTime(now);
+ if (!waitPakinService.update(setParam, wrapper)) {
+ throw new CoolException("鏇存柊閫氱煡妗ｅけ璐�");
+ }
+ }
+
+ // 鏇存柊婧愮珯鐐逛俊鎭�
+ sourceStaNo.setWrkNo(workNo);
+ sourceStaNo.setModiTime(now);
+ if (!basDevpService.updateById(sourceStaNo)){
+ throw new CoolException("鏇存柊婧愮珯澶辫触");
+ }
+
+ return R.ok(dto);
+ }
+
// 缃愯瀹屾垚鍏ュ簱
@PostMapping("/pakin/CanningLine/loc/v1")
@ResponseBody
@@ -157,23 +235,19 @@
}
// 鑾峰彇绯荤粺閰嶇疆锛岀湅鎴愬搧缃愯瀹屾垚鏄惁鐩存帴鍑哄埌鍙戣揣鍙�
- Config config = configService.selectConfigByCode("gzwcfh");
+ Config config = configService.selectConfigByCode("gzxfh" + param.getSourceStaNo());
boolean fhFlag = false;
+ int fhk = 0; // 鍙戣揣鍙�
if (config != null && config.getStatus() == 1 && !Cools.isEmpty(config.getValue())) {
- String[] split = config.getValue().split("=");
- for(String item : split) {
- if(param.getMatnr().equals(item)) {
- fhFlag = true;
- break;
- }
- }
+ fhFlag = true;
+ fhk = Integer.parseInt(config.getValue());
}
Date now = new Date();
StartupDto dto;
// 鍒ゆ柇璐存爣寮傚父锛屽妫�閲嶉噺寮傚父鐨勶紝涓嶅垎閰嶅簱浣嶏紝鍘诲線寮傚父鍙�1090
-// if ( !param.isTbFlag() || param.getGrossWeight() < param.getWeight()) {
+// if ( !param.isTbFlag() || !param.isReinspection()) {
//
// // 鐢熸垚宸ヤ綔妗� ------------------------------------------------------
// WrkMast wrkMast = new WrkMast();
@@ -207,9 +281,10 @@
// wrkDetl.setManuDate(param.getManuDate());
// wrkDetl.setWeight(param.getWeight());
// wrkDetl.setManLength(param.getGrossWeight());
-// wrkDetl.setInspect(1); // 璐存爣鎴愬姛
+// wrkDetl.setInspect(param.isTbFlag()?1:0); // 璐存爣鎴愬姛
// wrkDetl.setIoTime(now);
// wrkDetl.setAppeTime(now);
+// wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
// wrkDetlService.insert(wrkDetl);
//
// dto = new StartupDto();
@@ -227,7 +302,7 @@
wrkMast.setIoPri(13D); // 浼樺厛绾�
// wrkMast.setCrnNo(dto.getCrnNo());
wrkMast.setSourceStaNo(param.getSourceStaNo());
- wrkMast.setStaNo(1016);
+ wrkMast.setStaNo(fhk);
// wrkMast.setLocNo(dto.getLocNo());
wrkMast.setBarcode(wrkMast1.getBarcode()); // 鎵樼洏鐮�
wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -253,6 +328,7 @@
wrkDetl.setInspect(1);
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
wrkDetlService.insert(wrkDetl);
dto = new StartupDto();
@@ -305,6 +381,8 @@
wrkDetl.setInspect(1); // 璐存爣鎴愬姛
wrkDetl.setIoTime(now);
wrkDetl.setAppeTime(now);
+ log.warn("鎴愬搧缃愯瀹屾垚锛屾《绫诲瀷淇濆瓨锛屾柊浠诲姟鍙凤細{},鏃т换鍔″彿:{},鏃т换鍔℃《鍨�:{}",workNo,wrkMast1.getWrkNo(),wrkDetl1.getMaktx());
+ wrkDetl.setModel(wrkDetl1.getMaktx()); // 淇濆瓨绌烘《鍚嶇О
wrkDetlService.insert(wrkDetl);
// 鏇存柊鐩爣搴撲綅鐘舵��
@@ -374,7 +452,7 @@
if(!param.isTbFlag()) { //涓嬬嚎鍑哄簱
wrkMast.setSourceStaNo(1090);
- wrkMast.setStaNo(1016); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1016
+ wrkMast.setStaNo(1024); // 寮傚父涓嬬嚎榛樿鍏ュ簱绔欑偣涓�1016
wrkMastService.updateById(wrkMast);
return R.ok();
}
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 e37c873..614101e 100644
--- a/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
+++ b/src/main/java/com/zy/common/web/param/CanningLineInLocParam.java
@@ -28,6 +28,9 @@
// 澶嶆閲嶉噺
private double grossWeight;
+ // 澶嶆鍚堟牸鍚�
+ private boolean reinspection;
+
// 婧愮珯鐐�
private Integer sourceStaNo;
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index da3a1f8..27e9518 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -32,6 +32,9 @@
// 缃愯绾胯妗� 缃愯绾垮彿-妗剁被鍨�
private List<WantBucket> wantBucketFlag;
+ // 澶栧舰妫�娴�/绉伴噸鎶ラ敊锛屽嚭鍒板嚭搴撳彛1024
+ private String errMsg;
+
@Data
@AllArgsConstructor
public static class WantBucket{
diff --git a/src/main/resources/mapper/WrkMastMapper.xml b/src/main/resources/mapper/WrkMastMapper.xml
index fdfd529..5f7ca5b 100644
--- a/src/main/resources/mapper/WrkMastMapper.xml
+++ b/src/main/resources/mapper/WrkMastMapper.xml
@@ -73,9 +73,9 @@
<select id="selectToBeHistoryData" resultMap="BaseResultMap">
select * from asr_wrk_mast
- where wrk_sts=5
+ 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,2,crn_end_time) <= getdate() 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>
@@ -155,5 +155,20 @@
<select id="selectLastInEmptyLoc" resultType="com.zy.asrs.entity.WrkMast">
select wrk_no wrkNo,ctn_type ctnType,Pdc_type pdcType,loc_no locNo from asr_wrk_mast where sta_no = 1050 and wrk_sts in(2,9,10) order by io_time desc
</select>
+ <select id="selectInGzxCount" resultType="java.lang.Integer">
+ SELECT
+ count(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)
+ AND m.sta_no = #{site}
+ AND d.wrk_no IS NOT NULL)
+ OR (m.wrk_sts = 10
+ AND m.sta_no = #{site}
+ AND d.wrk_no IS NULL)
+ </select>
</mapper>
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 0532a54..dbf9993 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -243,8 +243,8 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', 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: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', 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 14c17ee..2a744f7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,16 +2,16 @@
function getCol() {
var cols = [
{type: 'checkbox'},
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'locNo$', align: 'center',title: '搴撲綅鍙�', width: 100}
+ ,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', width: 100, sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',width: 110, sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵瑰彿', sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', width: 60}
+ ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', width: 100}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ ,{field: 'model', align: 'center',title: '妗剁被鍨�'}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
@@ -24,7 +24,8 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�'}
+ ,{field: 'man_length', align: 'center',title: '姣涢噸'}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -36,7 +37,8 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',
+ ,{field: 'appeTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+ ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,
templet: function(d) {
// 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
if (d.frozen$ === '宸插喕缁�') {
@@ -49,7 +51,7 @@
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿',hide: true}
)
return cols;
}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 6591194..d5a134f 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -34,12 +34,22 @@
</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="batch" placeholder="鎵瑰彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="orderNo" placeholder="璁㈠崟鍙�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="model" placeholder="妗跺瀷" autocomplete="off">
</div>
</div>
<div class="layui-inline">
--
Gitblit v1.9.1