From 16a3dbbf28606a90dd6dadeffe843f53f72d3955 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期五, 29 三月 2024 16:28:57 +0800
Subject: [PATCH] 初始化库位和站点
---
src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/param/AgvTaskCallBackParam.java | 2
src/main/webapp/views/agvBasDevp/basDevp_detail.html | 215 +----------------------------------
src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java | 4
src/main/java/com/zy/asrs/controller/AgvOpenController.java | 19 +-
src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java | 2
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 4
src/main/webapp/static/js/agvWrkMast/wrkMast.js | 2
src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java | 2
src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java | 2
src/main/java/com/zy/common/service/AgvCommonService.java | 2
src/main/java/com/zy/asrs/controller/AgvMobileController.java | 5
src/main/webapp/static/js/agvBasDevp/basDevp.js | 9 +
src/main/webapp/views/agvBasDevp/basDevp.html | 1
src/main/java/com/zy/asrs/entity/AgvBasDevp.java | 30 ++--
src/main/resources/application.yml | 6
src/main/webapp/static/js/agvStoMan/stoQue.js | 3
17 files changed, 55 insertions(+), 255 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMobileController.java b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
index cc87a8f..69e0bb0 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMobileController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMobileController.java
@@ -131,9 +131,10 @@
@PostMapping("/pakout/empty/container/selector/auth")
public R containerType(@RequestBody HashMap<String,String> params){
- Short locType = Short.valueOf(params.get("locType"));
+ String devNo = params.get("devNo");
+ AgvBasDevp agvBasDevp = agvBasDevpService.selectById(devNo);
- return R.ok(agvLocMastService.queryContainerTypeByLocType1(locType));
+ return R.ok(agvLocMastService.queryContainerTypeByLocType1(agvBasDevp.getLocType1()));
}
diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 18346cb..55492df 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -72,7 +72,7 @@
//save api log (appkey 鍚庣画娣诲姞)
AppAuthUtil.auth("",param, request);
- int wrkNo = Integer.parseInt(param.getReqCode());
+ int wrkNo = Integer.parseInt(param.getTaskCode());
if(wrkNo < 0){
wrkNo = -wrkNo;
}
@@ -136,17 +136,18 @@
}
},
/**
- * 涓婃姤浠诲姟鍒嗛厤缁欐満鍣ㄤ汉
+ * 浠诲姟寮�濮�
*/
start{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-
+ //淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负203.浠诲姟寮�濮�
+ agvWrkMast.setWrkSts(203L);
+ agvWrkMastService.updateById(agvWrkMast);
}
-
},
/**
- * 涓婃姤鍙栫鐘舵��
+ * 璧板嚭鍌ㄤ綅鐘舵��
*/
outbin{
@Transactional
@@ -159,7 +160,7 @@
}
//淇敼AGV宸ヤ綔妗ｇ殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓�
- agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);
+ agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
}
@@ -170,11 +171,7 @@
cancel{
@Transactional
public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
- //淇敼宸ヤ綔妗ｇ姸鎬佷负204.鏀捐揣瀹屾垚
- agvWrkMast.setWrkSts(204L);
- //agvWrkMast.setLocNo(param.getLocationCode());
- agvWrkMastService.updateById(agvWrkMast);
- //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
+
}
diff --git a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
index f606cd1..0442ee2 100644
--- a/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/AgvBasDevp.java
@@ -243,20 +243,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getLocType1$() {
- if (null == this.locType1){ return null; }
- switch (this.locType1){
- case 0:
- return "鏈煡";
- case 1:
- return "浣庡簱浣�";
- case 2:
- return "楂樺簱浣�";
- default:
- return String.valueOf(this.locType1);
- }
- }
-
public String getLocType2$() {
if (null == this.locType2){ return null; }
switch (this.locType2){
@@ -285,6 +271,22 @@
}
}
+ public String getLocType1$() {
+ if (null == this.locType1){ return null; }
+ switch (this.locType1){
+ case 0:
+ return "鏈煡";
+ case 1:
+ return "寰呭寘瑁�";
+ case 2:
+ return "鍘熸潗鏂�";
+ case 3:
+ return "绠卞３";
+ default:
+ return String.valueOf(this.locType1);
+ }
+ }
+
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskCallBackParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskCallBackParam.java
index 4943f7d..d516dc4 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskCallBackParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskCallBackParam.java
@@ -9,7 +9,7 @@
private static final long serialVersionUID = 1L;
//璇锋眰缂栧彿
- private String reqCode;
+ private String taskCode;
//浠诲姟鐘舵��
private String method;
diff --git a/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java b/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
index fc32cd3..3bf229d 100644
--- a/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/AgvTaskCreateParam.java
@@ -14,7 +14,7 @@
private static final long serialVersionUID = 1L;
//浠诲姟鍙�
- private String reqCode;
+ private String taskCode;
//浠诲姟绫诲瀷
private String taskTyp;
diff --git a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
index 70ffb2d..edb28d1 100644
--- a/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/AgvWrkMastMapper.java
@@ -15,12 +15,12 @@
"source_loc_no," +
"loc_no," +
"barcode," +
- "mk," +
+ "whs_type," +
"appe_user," +
"appe_time," +
"modi_user," +
"modi_time) " +
- "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{mk},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
+ "VALUES(#{wrkSts},#{ioType},#{ioTime},#{ioPri},#{sourceLocNo},#{locNo},#{barcode},#{whsType},#{appeUser},#{appeTime},#{modiUser},#{modiTime})")
public int insertByIncrease(AgvWrkMast agvWrkMast);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
index 6fa99d4..7adeaaa 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvBasDevpServiceImpl.java
@@ -49,7 +49,7 @@
//寰呭寘瑁呮垚鍝佸瓨鍌ㄥ尯鍑哄簱鎺ラ┏浣�
this.insertBatch(getConnectionBasDevpList("DO",8,2,false,(short)1));
//鍘熸潗鏂欏叆搴撴帴椹充綅
- this.insertBatch(getConnectionBasDevpList("YI",15,2,true,(short)2));
+ this.insertBatch(getConnectionBasDevpList("YI",14,2,true,(short)2));
//鍘熸潗鏂欏嚭搴撴帴椹充綅
this.insertBatch(getConnectionBasDevpList("YO",18,2,false,(short)2));
//绠卞３鍏ュ簱鎺ラ┏浣�
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
index 40fc577..65121a2 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvLocDetlServiceImpl.java
@@ -91,7 +91,7 @@
locDto.setIsoseq(isoseq);
locDto.setContainerCode(agvLocDetl.getSuppCode());
//褰撳墠搴撲綅鎵�澶勬ゼ灞�
- int floor = Integer.parseInt(agvLocDetl.getLocNo().split("@")[1]);
+ int floor = Integer.parseInt(agvLocDetl.getLocNo().split("F")[1]);
//locDto.setAgvStaNos(queryAgvStaNosByFloor(floor));
locDto.setAgvStaNos(agvBasDevpService.selectCacheShelvesStationCodeByLocType(agvLocMast.getLocType1()));
locDtoList.add(locDto);
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index 65fc736..c2b575b 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -169,7 +169,7 @@
// //鐩爣浣�
// agvTaskParamList.add(new AgvTaskParam(agvWrkMast.getLocNo()));
- agvTaskCreateParam.setReqCode(agvWrkMast.getWrkNo().toString());
+ agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
agvTaskCreateParam.setTaskTyp("F01");
agvTaskCreateParam.setPositionCodePath(agvTaskParamList);
@@ -188,7 +188,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- int code = (int) jsonObject.get("code");
+ int code = Integer.parseInt(jsonObject.get("code").toString());
if(code != 0){
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
}
diff --git a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
index 4f425b5..e703d2d 100644
--- a/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
+++ b/src/main/java/com/zy/asrs/task/AgvWrkMastScheduler.java
@@ -75,7 +75,7 @@
putaway锛氫笂鏋�
瀹氭椂澶勭悊AGV宸ヤ綔妗ｄ腑宸ヤ綔鐘舵�佷负201.鐢熸垚鍏ュ簱浠诲姟ID 涓�(鍑哄簱绫诲瀷涓� 53.鎷ｆ枡鍐嶅叆搴� || 1.鍏ュ簱 || 10.绌烘澘鍏ュ簱鏍� || 57.鐩樼偣鍐嶅叆搴�)鐨勬暟鎹�
*/
- //@Scheduled(cron = "0/10 * * * * ? ")
+ @Scheduled(cron = "0/10 * * * * ? ")
public void startPutwayWrk(){
List<AgvWrkMast> agvWrkMastList = agvWrkMastService.selectPage(new Page<>(1, 50)
,new EntityWrapper<AgvWrkMast>()
diff --git a/src/main/java/com/zy/common/service/AgvCommonService.java b/src/main/java/com/zy/common/service/AgvCommonService.java
index 8c7f9f1..b362b5b 100644
--- a/src/main/java/com/zy/common/service/AgvCommonService.java
+++ b/src/main/java/com/zy/common/service/AgvCommonService.java
@@ -230,7 +230,7 @@
private AgvLocMast getLocNoRule(int type){
return agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>()
.eq("loc_sts","O")
- .eq(false,"loc_type1",type));
+ .eq("loc_type1",type));
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fda05c3..ecd08f4 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,7 +10,7 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://192.168.43.49:1433;databasename=phyzasrs
+ url: jdbc:sqlserver://localhost:1433;databasename=phyzasrs
# url: jdbc:sqlserver://192.168.4.15:1433;databasename=tzskasrs
#url: jdbc:sqlserver://10.10.10.40:1433;databasename=tzskasrs
username: sa
@@ -78,8 +78,8 @@
# containerMoveInPath: /agv/container/moveIn
# containerMoveOutPath: /agv/container/moveOut
# containerArrivedPath: /agv/containerArrived
- url: 10.10.10.182:9046
- taskCreatePath: /task/create
+ url: 192.168.103.32:8181
+ taskCreatePath: /rcms/services/rest/hikRpcService/genAgvSchedulingTask
containerMoveInPath: /expand/api/moveIn/container
containerMoveOutPath: /expand/api/moveOut/container
containerArrivedPath: /conveyor/containerArrived
diff --git a/src/main/webapp/static/js/agvBasDevp/basDevp.js b/src/main/webapp/static/js/agvBasDevp/basDevp.js
index cbe7787..e787e19 100644
--- a/src/main/webapp/static/js/agvBasDevp/basDevp.js
+++ b/src/main/webapp/static/js/agvBasDevp/basDevp.js
@@ -40,7 +40,7 @@
,{field: 'floor', align: 'center',title: '妤�'}
//,{field: 'locType1$', align: 'center',title: '楂樹綆'}
,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- ,{field: 'locType1', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'locType2', align: 'center',title: "瀹瑰櫒绫诲瀷"}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',event: 'modiUser', hide:true}
@@ -471,8 +471,8 @@
cacheShelves: $('#cacheShelves').val(),
decDesc: $('#decDesc').val(),
devMk: $('#devMk').val(),
- inEnable: $('#inEnable').val(),
- outEnable: $('#outEnable').val(),
+ inEnable: $('#inEnable').next().hasClass('layui-form-checked') ? "Y" : "N",
+ outEnable: $('#outEnable').next().hasClass('layui-form-checked') ? "Y" : "N",
autoing: $('#autoing').val(),
loading: $('#loading').val(),
canining: $('#canining').val(),
@@ -502,6 +502,9 @@
maxWt: $('#maxWt').val(),
grossWt: $('#grossWt').val(),
cartPos: $('#cartPos').val(),
+ floor: $('#floor').val(),
+ locType1: $('#locType1').val(),
+ locType2: $('#locType2').val(),
};
console.log(data);
diff --git a/src/main/webapp/static/js/agvStoMan/stoQue.js b/src/main/webapp/static/js/agvStoMan/stoQue.js
index 0466e10..300fa9d 100644
--- a/src/main/webapp/static/js/agvStoMan/stoQue.js
+++ b/src/main/webapp/static/js/agvStoMan/stoQue.js
@@ -36,7 +36,8 @@
,{field: 'lev1', align: 'center',title: '灞�'}
,{field: 'floor', align: 'center',title: '妤�', sort:true}
,{field: 'barcode', align: 'center',title: '瀹瑰櫒鐮�', sort:true}
- ,{field: 'barcode', align: 'center',title: '瀹瑰櫒绫诲瀷', sort:true}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷', sort:true}
+ ,{field: 'locType2', align: 'center',title: '瀹瑰櫒绫诲瀷', sort:true}
,{field: 'fullPlt', align: 'center',title: '婊℃澘', templet:function(row){
var html = "<input value='fullPlt' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.fullPlt === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/static/js/agvWrkMast/wrkMast.js b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
index e0e4a42..fd57ab4 100644
--- a/src/main/webapp/static/js/agvWrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/agvWrkMast/wrkMast.js
@@ -31,7 +31,7 @@
,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
//,{field: 'steNo', align: 'center',title: '灏忚溅', width: 70}
,{field: 'barcode', align: 'center',title: '瀹瑰櫒鐮�'}
- ,{field: 'barcode', align: 'center',title: '瀹瑰櫒绫诲瀷'}
+ ,{field: 'whsType', align: 'center',title: '瀹瑰櫒绫诲瀷'}
,{field: 'preHave', align: 'center',title: '鍏堝叆鍝�', hide: true}
,{field: 'takeNone', align: 'center',title: '绌烘搷浣�', hide: true}
// ,{field: 'picking', align: 'center',title: '鎷ｆ枡', templet:function(row){
diff --git a/src/main/webapp/views/agvBasDevp/basDevp.html b/src/main/webapp/views/agvBasDevp/basDevp.html
index cf5bbde..4e1da44 100644
--- a/src/main/webapp/views/agvBasDevp/basDevp.html
+++ b/src/main/webapp/views/agvBasDevp/basDevp.html
@@ -47,7 +47,6 @@
<button class="layui-btn layui-btn-sm" id="btn-add" 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" id="btn-init" lay-event="init">鍒濆鍖�</button>
- <button class="layui-btn layui-btn-primary" id="btn-createWrk" lay-event="createWrk">鍏ュ簱</button>
<button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">瀵煎嚭</button>
</div>
</script>
diff --git a/src/main/webapp/views/agvBasDevp/basDevp_detail.html b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
index b001735..2d4d3cd 100644
--- a/src/main/webapp/views/agvBasDevp/basDevp_detail.html
+++ b/src/main/webapp/views/agvBasDevp/basDevp_detail.html
@@ -15,20 +15,6 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form" style="text-align: left">
- <!--
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
- </div>
- </div>
- -->
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>宸ヤ綔绔欑紪鍙凤細</label>
- <div class="layui-input-inline">
- <input id="stationCode" class="layui-input" type="text" >
- </div>
- </div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label"><span class="not-null">*</span>宸ヤ綔浣嶇紪鍙凤細</label>
<div class="layui-input-inline">
@@ -42,224 +28,35 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">缂撳瓨璐ф灦锛�</label>
- <div class="layui-input-inline">
- <input id="cacheShelves" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
-
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">澶囥��銆�娉細</label>
- <div class="layui-input-inline">
- <input id="devMk" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鍙��銆�鍏ワ細</label>
<div class="layui-input-inline">
- <input id="inEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ <input id="inEnable" class="layui-input" type="checkBox" lay-skin="primary" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鍙��銆�鍑猴細</label>
<div class="layui-input-inline">
- <input id="outEnable" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
+ <input id="outEnable" class="layui-input" type="checkBox" lay-skin="primary" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鑷��銆�鍔細</label>
+ <label class="layui-form-label">搴撲綅绫诲瀷锛�</label>
<div class="layui-input-inline">
- <input id="autoing" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏈夈��銆�鐗╋細</label>
- <div class="layui-input-inline">
- <input id="loading" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鑳姐��銆�鍏ワ細</label>
- <div class="layui-input-inline">
- <input id="canining" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鑳姐��銆�鍑猴細</label>
- <div class="layui-input-inline">
- <input id="canouting" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="fronting" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="rearing" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="uping" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="downing" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">闇� 姹� 1锛�</label>
- <div class="layui-input-inline">
- <input id="inreq1" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">闇� 姹� 2锛�</label>
- <div class="layui-input-inline">
- <input id="inreq2" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">宸� 浣� 鍙凤細</label>
- <div class="layui-input-inline">
- <input id="wrkNo" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="wrkNo1" class="layui-input" type="text">
+ <input id="locType1" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">瀹瑰櫒绫诲瀷锛�</label>
<div class="layui-input-inline">
- <input id="ctnType" class="layui-input" type="text">
+ <input id="locType2" class="layui-input" type="text">
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鏉� 褰� 鐮侊細</label>
+ <label class="layui-form-label">瀹瑰櫒鐮侊細</label>
<div class="layui-input-inline">
<input id="barcode" class="layui-input" type="text">
</div>
</div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍏ュ簱鏆傚瓨锛�</label>
- <div class="layui-input-inline">
- <input id="inQty" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="row1" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="ioTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="area" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="inOk" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="outOk" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼浜哄憳锛�</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="modiUser" class="layui-input" type="text" style="display: none">
- <input id="modiUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">淇敼鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="modiTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鍒� 寤� 鑰咃細</label>
- <div class="layui-input-inline cool-auto-complete">
- <input id="appeUser" class="layui-input" type="text" style="display: none">
- <input id="appeUser$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
- <div class="cool-auto-complete-window">
- <input class="cool-auto-complete-window-input" data-key="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">娣诲姞鏃堕棿锛�</label>
- <div class="layui-input-inline">
- <input id="appeTime$" class="layui-input" type="text" autocomplete="off">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="stdQty" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="minWt" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="maxWt" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">閲嶃��銆�閲忥細</label>
- <div class="layui-input-inline">
- <input id="grossWt" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">锛�</label>
- <div class="layui-input-inline">
- <input id="cartPos" class="layui-input" type="text">
- </div>
- </div>
- <div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">璁惧鎻忚堪锛�</label>
- <div class="layui-input-inline">
- <input id="decDesc" class="layui-input" type="text">
- </div>
- </div>
-
-
<hr class="layui-bg-gray">
<div id="data-detail-btn" class="layui-btn-container layui-form-item">
--
Gitblit v1.9.1