From 04b1a3915a612bf806f6c6b83e0e9c501560065a Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 07 十二月 2023 10:43:58 +0800
Subject: [PATCH] #卷信息
---
src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js | 43 ++--
src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java | 317 +++++++++----------------------
src/main/resources/mapper/LocDetlRullUpDetailMapper.xml | 39 +--
src/main/java/com/zy/asrs/controller/LocDetlRullUpDetailController.java | 6
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 11 +
src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html | 138 +++++--------
6 files changed, 196 insertions(+), 358 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlRullUpDetailController.java b/src/main/java/com/zy/asrs/controller/LocDetlRullUpDetailController.java
index 7a03f4e..ecac3e8 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlRullUpDetailController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlRullUpDetailController.java
@@ -66,8 +66,8 @@
return R.ok();
}
- @RequestMapping(value = "/locDetlRullUpDetail/update/auth")
- @ManagerAuth
+ @RequestMapping(value = "/locDetlRullUpDetail/update/auth")
+ @ManagerAuth
public R update(LocDetlRullUpDetail locDetlRullUpDetail){
if (Cools.isEmpty(locDetlRullUpDetail) || null==locDetlRullUpDetail.getId()){
return R.error();
@@ -79,7 +79,7 @@
@RequestMapping(value = "/locDetlRullUpDetail/delete/auth")
@ManagerAuth
public R delete(@RequestParam(value="ids[]") Long[] ids){
- for (Long id : ids){
+ for (Long id : ids){
locDetlRullUpDetailService.deleteById(id);
}
return R.ok();
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
index 9b3a3b2..6e2e0ca 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
@@ -1,27 +1,7 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkStatusService;
-import com.zy.asrs.entity.BasWrkStatus;
-import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasWrkIotypeService;
-import com.zy.asrs.entity.BasWrkIotype;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import com.core.common.SpringUtils;
-import com.zy.system.service.UserService;
-import com.zy.system.entity.User;
+import com.core.common.Cools;
+import com.baomidou.mybatisplus.annotations.TableField;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -47,270 +27,153 @@
private Long uuid;
/**
- * 宸ヤ綔鍙�
+ * 鍗峰彿
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableField("wrk_no")
- private Integer wrkNo;
+ @ApiModelProperty(value= "鍗峰彿")
+ @TableField("roll_no")
+ private String rollNo;
/**
- * 鍙戠敓鏃堕棿
+ * 閲嶉噺
*/
- @ApiModelProperty(value= "鍙戠敓鏃堕棿")
- @TableField("start_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date startTime;
+ @ApiModelProperty(value= "閲嶉噺")
+ @TableField("roll_weight")
+ private String rollWeight;
/**
- * 缁撴潫鏃堕棿
+ * 闀垮害
*/
- @ApiModelProperty(value= "缁撴潫鏃堕棿")
- @TableField("end_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date endTime;
+ @ApiModelProperty(value= "闀垮害")
+ @TableField("roll_length")
+ private String rollLength;
/**
- * 宸ヤ綔鐘舵��
+ * 瀹藉害
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
- @TableField("wrk_sts")
- private Long wrkSts;
+ @ApiModelProperty(value= "瀹藉害")
+ @TableField("roll_width")
+ private String rollWidth;
/**
- * 鍏ュ嚭搴撶被鍨�
+ * 鍘氬害
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
- @TableField("io_type")
- private Integer ioType;
+ @ApiModelProperty(value= "鍘氬害")
+ @TableField("roll_thickness")
+ private String rollThickness;
/**
- * 鍫嗗灈鏈�
+ * 鍗风姸鎬�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- @TableField("crn_no")
- private Integer crnNo;
+ @ApiModelProperty(value= "鍗风姸鎬�")
+ @TableField("roll_status")
+ private Integer rollStatus;
/**
- * plc
+ * 鍖呰鍙�
*/
- @ApiModelProperty(value= "plc")
- @TableField("plc_no")
- private Integer plcNo;
+ @ApiModelProperty(value= "鍖呰鍙�")
+ @TableField("roll_papeage_no")
+ private Integer rollPapeageNo;
/**
- * 鐩爣搴撲綅
+ * 杞﹀彿
*/
- @ApiModelProperty(value= "鐩爣搴撲綅")
- @TableField("loc_no")
- private String locNo;
+ @ApiModelProperty(value= "杞﹀彿")
+ @TableField("roll_car_no")
+ private Integer rollCarNo;
/**
- * 鐩爣绔�
+ * 閲戦
*/
- @ApiModelProperty(value= "鐩爣绔�")
- @TableField("sta_no")
- private Integer staNo;
+ @ApiModelProperty(value= "閲戦")
+ @TableField("roll_amount")
+ private String rollAmount;
/**
- * 婧愮珯
+ * 瀹㈡埛Id
*/
- @ApiModelProperty(value= "婧愮珯")
- @TableField("source_sta_no")
- private Integer sourceStaNo;
+ @ApiModelProperty(value= "瀹㈡埛Id")
+ @TableField("roll_custom_id")
+ private Integer rollCustomId;
/**
- * 婧愬簱浣�
+ * 鍘傚尯
*/
- @ApiModelProperty(value= "婧愬簱浣�")
- @TableField("source_loc_no")
- private String sourceLocNo;
+ @ApiModelProperty(value= "鍘傚尯")
+ @TableField("roll_factory")
+ private Integer rollFactory;
/**
- * 鏉＄爜
+ * 澶囩敤1
*/
- @ApiModelProperty(value= "鏉＄爜")
- private String barcode;
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1;
/**
- * 寮傚父鐮�
+ * 澶囩敤2
*/
- @ApiModelProperty(value= "寮傚父鐮�")
- @TableField("err_code")
- private Integer errCode;
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2;
/**
- * 寮傚父
+ * 澶囩敤3
*/
- @ApiModelProperty(value= "寮傚父")
- private String error;
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 澶囩敤4
*/
- @ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
- private Integer status;
+ @ApiModelProperty(value= "澶囩敤4")
+ private String standby4;
/**
- * 娣诲姞鏃堕棿
+ * 澶囩敤5
*/
- @ApiModelProperty(value= "娣诲姞鏃堕棿")
- @TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date createTime;
+ @ApiModelProperty(value= "澶囩敤5")
+ private String standby5;
/**
- * 娣诲姞浜哄憳
+ * 澶囩敤6
*/
- @ApiModelProperty(value= "娣诲姞浜哄憳")
- @TableField("create_by")
- private Long createBy;
+ @ApiModelProperty(value= "澶囩敤6")
+ private String standby6;
/**
- * 淇敼鏃堕棿
+ * 澶囩敤7
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- private Date updateTime;
+ @ApiModelProperty(value= "澶囩敤7")
+ private String standby7;
/**
- * 淇敼浜哄憳
+ * 澶囩敤8
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
- @TableField("update_by")
- private Long updateBy;
-
- /**
- * 澶囨敞
- */
- @ApiModelProperty(value= "澶囨敞")
- private String memo;
+ @ApiModelProperty(value= "澶囩敤8")
+ private String standby8;
public LocDetlRullUpDetail() {}
- public LocDetlRullUpDetail(Long uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer crnNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public LocDetlRullUpDetail(Long uuid,String rollNo,String rollWeight,String rollLength,String rollWidth,String rollThickness,Integer rollStatus,Integer rollPapeageNo,Integer rollCarNo,String rollAmount,Integer rollCustomId,Integer rollFactory,String standby1,String standby2,String standby3,String standby4,String standby5,String standby6,String standby7,String standby8) {
this.uuid = uuid;
- this.wrkNo = wrkNo;
- this.startTime = startTime;
- this.endTime = endTime;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.plcNo = plcNo;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.barcode = barcode;
- this.errCode = errCode;
- this.error = error;
- this.status = status;
- this.createTime = createTime;
- this.createBy = createBy;
- this.updateTime = updateTime;
- this.updateBy = updateBy;
- this.memo = memo;
+ this.rollNo = rollNo;
+ this.rollWeight = rollWeight;
+ this.rollLength = rollLength;
+ this.rollWidth = rollWidth;
+ this.rollThickness = rollThickness;
+ this.rollStatus = rollStatus;
+ this.rollPapeageNo = rollPapeageNo;
+ this.rollCarNo = rollCarNo;
+ this.rollAmount = rollAmount;
+ this.rollCustomId = rollCustomId;
+ this.rollFactory = rollFactory;
+ this.standby1 = standby1;
+ this.standby2 = standby2;
+ this.standby3 = standby3;
+ this.standby4 = standby4;
+ this.standby5 = standby5;
+ this.standby6 = standby6;
+ this.standby7 = standby7;
+ this.standby8 = standby8;
}
-
-// LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail(
-// null, // 缂栧彿
-// null, // 宸ヤ綔鍙�
-// null, // 鍙戠敓鏃堕棿
-// null, // 缁撴潫鏃堕棿
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, // plc
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, // 鏉＄爜
-// null, // 寮傚父鐮�
-// null, // 寮傚父
-// null, // 寮傚父鎯呭喌
-// null, // 娣诲姞鏃堕棿
-// null, // 娣诲姞浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 淇敼浜哄憳
-// null // 澶囨敞
-// );
-
- public String getStartTime$(){
- if (Cools.isEmpty(this.startTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.startTime);
- }
-
- public String getEndTime$(){
- if (Cools.isEmpty(this.endTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
- }
-
- public String getWrkSts$(){
- BasWrkStatusService service = SpringUtils.getBean(BasWrkStatusService.class);
- BasWrkStatus basWrkStatus = service.selectById(this.wrkSts);
- if (!Cools.isEmpty(basWrkStatus)){
- return String.valueOf(basWrkStatus.getWrkDesc());
- }
- return null;
- }
-
- public String getIoType$(){
- BasWrkIotypeService service = SpringUtils.getBean(BasWrkIotypeService.class);
- BasWrkIotype basWrkIotype = service.selectById(this.ioType);
- if (!Cools.isEmpty(basWrkIotype)){
- return String.valueOf(basWrkIotype.getIoDesc());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
- case 1:
- return "鏈鐞�";
- case 2:
- return "宸蹭慨澶�";
- default:
- return String.valueOf(this.status);
- }
- }
-
- public String getCreateTime$(){
- if (Cools.isEmpty(this.createTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
- }
-
- public String getCreateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.createBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
- }
-
- public String getUpdateBy$(){
- UserService service = SpringUtils.getBean(UserService.class);
- User user = service.selectById(this.updateBy);
- if (!Cools.isEmpty(user)){
- return String.valueOf(user.getNickname());
- }
- return null;
- }
-
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 80f27d5..1d043db 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -61,6 +61,8 @@
private WaitPakinService waitPakinService;
@Autowired
private CommonService commonService;
+// @Autowired
+// private LocDetlRullUpDetailService locDetlRullUpDetailService;
@Override
@Transactional
@@ -740,6 +742,7 @@
Date now = new Date();
+ long rollUp = now.getTime();
for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
Mat mat = matService.selectByMatnr(matList.getMatnr());
if (Cools.isEmpty(mat)) {
@@ -760,6 +763,14 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setRollUp(rollUp);
+// if (!Cools.isEmpty(matList.getMatDetlList())){
+// for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
+// LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
+// locDetlRullUpDetail.setUuid(rollUp);
+// locDetlRullUpDetail.setWrkNo(matDetlList.getBoxNoDetl());
+// }
+// }
if (!waitPakinService.insert(waitPakin)) {
throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
}
diff --git a/src/main/resources/mapper/LocDetlRullUpDetailMapper.xml b/src/main/resources/mapper/LocDetlRullUpDetailMapper.xml
index d966c4c..50eb9e5 100644
--- a/src/main/resources/mapper/LocDetlRullUpDetailMapper.xml
+++ b/src/main/resources/mapper/LocDetlRullUpDetailMapper.xml
@@ -6,26 +6,25 @@
<resultMap id="BaseResultMap" type="com.zy.asrs.entity.LocDetlRullUpDetail">
<id column="id" property="id" />
<result column="uuid" property="uuid" />
- <result column="wrk_no" property="wrkNo" />
- <result column="start_time" property="startTime" />
- <result column="end_time" property="endTime" />
- <result column="wrk_sts" property="wrkSts" />
- <result column="io_type" property="ioType" />
- <result column="crn_no" property="crnNo" />
- <result column="plc_no" property="plcNo" />
- <result column="loc_no" property="locNo" />
- <result column="sta_no" property="staNo" />
- <result column="source_sta_no" property="sourceStaNo" />
- <result column="source_loc_no" property="sourceLocNo" />
- <result column="barcode" property="barcode" />
- <result column="err_code" property="errCode" />
- <result column="error" property="error" />
- <result column="status" property="status" />
- <result column="create_time" property="createTime" />
- <result column="create_by" property="createBy" />
- <result column="update_time" property="updateTime" />
- <result column="update_by" property="updateBy" />
- <result column="memo" property="memo" />
+ <result column="roll_no" property="rollNo" />
+ <result column="roll_weight" property="rollWeight" />
+ <result column="roll_length" property="rollLength" />
+ <result column="roll_width" property="rollWidth" />
+ <result column="roll_thickness" property="rollThickness" />
+ <result column="roll_status" property="rollStatus" />
+ <result column="roll_papeage_no" property="rollPapeageNo" />
+ <result column="roll_car_no" property="rollCarNo" />
+ <result column="roll_amount" property="rollAmount" />
+ <result column="roll_custom_id" property="rollCustomId" />
+ <result column="roll_factory" property="rollFactory" />
+ <result column="standby1" property="standby1" />
+ <result column="standby2" property="standby2" />
+ <result column="standby3" property="standby3" />
+ <result column="standby4" property="standby4" />
+ <result column="standby5" property="standby5" />
+ <result column="standby6" property="standby6" />
+ <result column="standby7" property="standby7" />
+ <result column="standby8" property="standby8" />
</resultMap>
diff --git a/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js b/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
index fa0e890..5f3f1f2 100644
--- a/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
+++ b/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
@@ -24,29 +24,28 @@
cellMinWidth: 50,
height: 'full-120',
cols: [[
- {type: 'checkbox'}
- ,{field: 'id', align: 'center',title: 'ID',hide : true}
+ // {type: 'checkbox'},
+ {field: 'id', align: 'center',title: 'ID',hide : true}
,{field: 'uuid', align: 'center',title: '缂栧彿',hide : true}
- ,{field: 'wrkNo', align: 'center',title: '鍗峰彿',hide : false}
- // ,{field: 'startTime$', align: 'center',title: '鍙戠敓鏃堕棿'}
- // ,{field: 'endTime$', align: 'center',title: '缁撴潫鏃堕棿'}
- // ,{field: 'wrkSts$', align: 'center',title: '宸ヤ綔鐘舵��'}
- // ,{field: 'ioType$', align: 'center',title: '鍏ュ嚭搴撶被鍨�'}
- // ,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈�'}
- // ,{field: 'plcNo', align: 'center',title: 'plc'}
- // ,{field: 'locNo', align: 'center',title: '鐩爣搴撲綅'}
- // ,{field: 'staNo', align: 'center',title: '鐩爣绔�'}
- // ,{field: 'sourceStaNo', align: 'center',title: '婧愮珯'}
- // ,{field: 'sourceLocNo', align: 'center',title: '婧愬簱浣�'}
- // ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- // ,{field: 'errCode', align: 'center',title: '寮傚父鐮�'}
- // ,{field: 'error', align: 'center',title: '寮傚父'}
- // ,{field: 'status$', align: 'center',title: '寮傚父鎯呭喌'}
- // ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
- // ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
- // ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
- // ,{field: 'updateBy$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'memo', align: 'center',title: '澶囨敞'}
+ ,{field: 'rollNo', align: 'center',title: '鍗峰彿',hide : false}
+ ,{field: 'rollWeight', align: 'center',title: '閲嶉噺',hide : false}
+ ,{field: 'rollLength', align: 'center',title: '闀垮害',hide : false}
+ ,{field: 'rollWidth', align: 'center',title: '瀹藉害',hide : false}
+ ,{field: 'rollThickness', align: 'center',title: '鍘氬害',hide : false}
+ ,{field: 'rollStatus', align: 'center',title: '鍗风姸鎬�',hide : false}
+ // ,{field: 'rollPapeageNo', align: 'center',title: '鍖呰鍙�',hide : true}
+ // ,{field: 'rollCarNo', align: 'center',title: '杞﹀彿',hide : true}
+ // ,{field: 'rollAmount', align: 'center',title: '閲戦',hide : true}
+ // ,{field: 'rollCustomId', align: 'center',title: '瀹㈡埛Id',hide : true}
+ // ,{field: 'rollFactory', align: 'center',title: '鍘傚尯',hide : true}
+ ,{field: 'standby1', align: 'center',title: '澶囨敞',hide : false}
+ ,{field: 'standby2', align: 'center',title: '澶囩敤2',hide : true}
+ ,{field: 'standby3', align: 'center',title: '澶囩敤3',hide : true}
+ ,{field: 'standby4', align: 'center',title: '澶囩敤4',hide : true}
+ ,{field: 'standby5', align: 'center',title: '澶囩敤5',hide : true}
+ ,{field: 'standby6', align: 'center',title: '澶囩敤6',hide : true}
+ ,{field: 'standby7', align: 'center',title: '澶囩敤7',hide : true}
+ ,{field: 'standby8', align: 'center',title: '澶囩敤8',hide : true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html b/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
index e3ac505..52b4e53 100644
--- a/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
+++ b/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
@@ -51,7 +51,7 @@
<div class="layui-btn-container">
<!-- <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鏂板</button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>-->
- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+<!-- <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>-->
</div>
</script>
@@ -79,155 +79,121 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鍙�: </label>
+ <label class="layui-form-label">鍗峰彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ュ伐浣滃彿">
+ <input class="layui-input" name="rollNo" placeholder="璇疯緭鍏ュ嵎鍙�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍙戠敓鏃堕棿: </label>
+ <label class="layui-form-label">閲嶉噺: </label>
<div class="layui-input-block">
- <input class="layui-input" name="startTime" id="startTime$" placeholder="璇疯緭鍏ュ彂鐢熸椂闂�">
+ <input class="layui-input" name="rollWeight" placeholder="璇疯緭鍏ラ噸閲�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫鏃堕棿: </label>
+ <label class="layui-form-label">闀垮害: </label>
<div class="layui-input-block">
- <input class="layui-input" name="endTime" id="endTime$" placeholder="璇疯緭鍏ョ粨鏉熸椂闂�">
+ <input class="layui-input" name="rollLength" placeholder="璇疯緭鍏ラ暱搴�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">宸ヤ綔鐘舵��: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="wrkSts" placeholder="璇疯緭鍏ュ伐浣滅姸鎬�" style="display: none">
- <input id="wrkSts$" name="wrkSts$" 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="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍏ュ嚭搴撶被鍨�: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="ioType" placeholder="璇疯緭鍏ュ叆鍑哄簱绫诲瀷" style="display: none">
- <input id="ioType$" name="ioType$" 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="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">鍫嗗灈鏈�: </label>
+ <label class="layui-form-label">瀹藉害: </label>
<div class="layui-input-block">
- <input class="layui-input" name="crnNo" placeholder="璇疯緭鍏ュ爢鍨涙満">
+ <input class="layui-input" name="rollWidth" placeholder="璇疯緭鍏ュ搴�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">plc: </label>
+ <label class="layui-form-label">鍘氬害: </label>
<div class="layui-input-block">
- <input class="layui-input" name="plcNo" placeholder="璇疯緭鍏lc">
+ <input class="layui-input" name="rollThickness" placeholder="璇疯緭鍏ュ帤搴�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐩爣搴撲綅: </label>
+ <label class="layui-form-label">鍗风姸鎬�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="locNo" placeholder="璇疯緭鍏ョ洰鏍囧簱浣�">
+ <input class="layui-input" name="rollStatus" placeholder="璇疯緭鍏ュ嵎鐘舵��">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鐩爣绔�: </label>
+ <label class="layui-form-label">鍖呰鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="staNo" placeholder="璇疯緭鍏ョ洰鏍囩珯">
+ <input class="layui-input" name="rollPapeageNo" placeholder="璇疯緭鍏ュ寘瑁呭彿">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">婧愮珯: </label>
+ <label class="layui-form-label">杞﹀彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="sourceStaNo" placeholder="璇疯緭鍏ユ簮绔�">
+ <input class="layui-input" name="rollCarNo" placeholder="璇疯緭鍏ヨ溅鍙�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">婧愬簱浣�: </label>
+ <label class="layui-form-label">閲戦: </label>
<div class="layui-input-block">
- <input class="layui-input" name="sourceLocNo" placeholder="璇疯緭鍏ユ簮搴撲綅">
+ <input class="layui-input" name="rollAmount" placeholder="璇疯緭鍏ラ噾棰�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鏉＄爜: </label>
+ <label class="layui-form-label">瀹㈡埛Id: </label>
<div class="layui-input-block">
- <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮�">
+ <input class="layui-input" name="rollCustomId" placeholder="璇疯緭鍏ュ鎴稩d">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">寮傚父鐮�: </label>
+ <label class="layui-form-label">鍘傚尯: </label>
<div class="layui-input-block">
- <input class="layui-input" name="errCode" placeholder="璇疯緭鍏ュ紓甯哥爜">
+ <input class="layui-input" name="rollFactory" placeholder="璇疯緭鍏ュ巶鍖�">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">寮傚父: </label>
+ <label class="layui-form-label">澶囩敤1: </label>
<div class="layui-input-block">
- <input class="layui-input" name="error" placeholder="璇疯緭鍏ュ紓甯�">
+ <input class="layui-input" name="standby1" placeholder="璇疯緭鍏ュ鐢�1">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">寮傚父鎯呭喌: </label>
+ <label class="layui-form-label">澶囩敤2: </label>
<div class="layui-input-block">
- <select name="status">
- <option value="">璇烽�夋嫨寮傚父鎯呭喌</option>
- <option value="1">鏈鐞�</option>
- <option value="2">宸蹭慨澶�</option>
- </select>
+ <input class="layui-input" name="standby2" placeholder="璇疯緭鍏ュ鐢�2">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">娣诲姞鏃堕棿: </label>
+ <label class="layui-form-label">澶囩敤3: </label>
<div class="layui-input-block">
- <input class="layui-input" name="createTime" id="createTime$" placeholder="璇疯緭鍏ユ坊鍔犳椂闂�">
+ <input class="layui-input" name="standby3" placeholder="璇疯緭鍏ュ鐢�3">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">娣诲姞浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="createBy" placeholder="璇疯緭鍏ユ坊鍔犱汉鍛�" style="display: none">
- <input id="createBy$" name="createBy$" 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="userQueryBycreateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryBycreateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <label class="layui-form-label">澶囩敤4: </label>
<div class="layui-input-block">
- <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ <input class="layui-input" name="standby4" placeholder="璇疯緭鍏ュ鐢�4">
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">淇敼浜哄憳: </label>
- <div class="layui-input-block cool-auto-complete">
- <input class="layui-input" name="updateBy" placeholder="璇疯緭鍏ヤ慨鏀逛汉鍛�" style="display: none">
- <input id="updateBy$" name="updateBy$" 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="userQueryByupdateBy" onkeyup="autoLoad(this.getAttribute('data-key'))">
- <select class="cool-auto-complete-window-select" data-key="userQueryByupdateBySelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">
- </select>
- </div>
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label">澶囨敞: </label>
+ <label class="layui-form-label">澶囩敤5: </label>
<div class="layui-input-block">
- <input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
+ <input class="layui-input" name="standby5" placeholder="璇疯緭鍏ュ鐢�5">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囩敤6: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby6" placeholder="璇疯緭鍏ュ鐢�6">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囩敤7: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby7" placeholder="璇疯緭鍏ュ鐢�7">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囩敤8: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="standby8" placeholder="璇疯緭鍏ュ鐢�8">
</div>
</div>
- </div>
+ </div>
</div>
<hr class="layui-bg-gray">
<div class="layui-form-item text-right">
--
Gitblit v1.9.1