From 54fc241d1a44ec21a6994ce0ae37ec7b22d3e748 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 09 十月 2025 16:46:09 +0800
Subject: [PATCH] #和得服务器
---
src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java | 4
src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java | 12
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 99 +++--
src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java | 12
src/main/java/com/zy/asrs/service/WrkMastStaService.java | 3
src/main/resources/mapper/WrkMastStaMapper.xml | 6
src/main/java/com/zy/asrs/service/BasDevpOptService.java | 8
src/main/java/basDevpOpt.sql | 18 +
src/main/java/com/zy/asrs/controller/BasDevpOptController.java | 169 +++++++++
src/main/java/com/zy/asrs/entity/BasDevpOpt.java | 174 ++++++++++
src/main/webapp/static/js/basDevpOpt/basDevpOpt.js | 270 +++++++++++++++
src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java | 2
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 27 +
src/main/resources/mapper/BasDevpOptMapper.xml | 26 +
src/main/webapp/views/basDevpOpt/basDevpOpt.html | 180 ++++++++++
15 files changed, 975 insertions(+), 35 deletions(-)
diff --git a/src/main/java/basDevpOpt.sql b/src/main/java/basDevpOpt.sql
new file mode 100644
index 0000000..f0d5e54
--- /dev/null
+++ b/src/main/java/basDevpOpt.sql
@@ -0,0 +1,18 @@
+-- save basDevpOpt record
+-- mysql
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt/basDevpOpt.html', 'basDevpOpt绠＄悊', null , '2', null , '1');
+
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#view', '鏌ヨ', '', '3', '0', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-add', '鏂板', '', '3', '1', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-edit', '缂栬緫', '', '3', '2', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-delete', '鍒犻櫎', '', '3', '3', '1');
+insert into `sys_resource` ( `code`, `name`, `resource_id`, `level`, `sort`, `status`) values ( 'basDevpOpt#btn-export', '瀵煎嚭', '', '3', '4', '1');
+
+-- sqlserver
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt/basDevpOpt.html', N'basDevpOpt绠＄悊', null, '2', null, '1');
+
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#view', N'鏌ヨ', '', '3', '0', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-add', N'鏂板', '', '3', '1', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-edit', N'缂栬緫', '', '3', '2', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-delete', N'鍒犻櫎', '', '3', '3', '1');
+insert [dbo].[sys_resource] ( [code], [name], [resource_id], [level], [sort], [status]) values ( N'basDevpOpt#btn-export', N'瀵煎嚭', '', '3', '4', '1');
diff --git a/src/main/java/com/zy/asrs/controller/BasDevpOptController.java b/src/main/java/com/zy/asrs/controller/BasDevpOptController.java
new file mode 100644
index 0000000..d78de6f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/controller/BasDevpOptController.java
@@ -0,0 +1,169 @@
+package com.zy.asrs.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
+import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.DateUtils;
+import com.zy.asrs.entity.BasDevpOpt;
+import com.zy.asrs.service.BasDevpOptService;
+import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
+import com.core.common.R;
+import com.zy.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.*;
+
+@RestController
+public class BasDevpOptController extends BaseController {
+ protected static final String RANGE_TIME_LINK = " - ";
+
+ @Autowired
+ private BasDevpOptService basDevpOptService;
+
+ @RequestMapping(value = "/basDevpOpt/{id}/auth")
+ @ManagerAuth
+ public R get(@PathVariable("id") String id) {
+ return R.ok(basDevpOptService.selectById(String.valueOf(id)));
+ }
+
+ @RequestMapping(value = "/basDevpOpt/list/auth")
+ @ManagerAuth
+ public R list(@RequestParam(defaultValue = "1")Integer curr,
+ @RequestParam(defaultValue = "10")Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
+ @RequestParam(required = false)String condition,
+ @RequestParam Map<String, Object> param){
+ EntityWrapper<BasDevpOpt> wrapper = new EntityWrapper<>();
+ excludeTrash(param);
+ convert(param, wrapper);
+ allLike(BasDevpOpt.class, param.keySet(), wrapper, condition);
+ if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
+ return R.ok(basDevpOptService.selectPage(new Page<>(curr, limit), wrapper));
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
+ for (Map.Entry<String, Object> entry : map.entrySet()){
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)){
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ wrapper.like(entry.getKey(), val);
+ }
+ }
+ }
+
+ @RequestMapping(value = "/basDevpOpt/add/auth")
+ @ManagerAuth
+ public R add(BasDevpOpt basDevpOpt) {
+ basDevpOptService.insert(basDevpOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDevpOpt/update/auth")
+ @ManagerAuth
+ public R update(BasDevpOpt basDevpOpt){
+ if (Cools.isEmpty(basDevpOpt) || null==basDevpOpt.getId()){
+ return R.error();
+ }
+ basDevpOptService.updateById(basDevpOpt);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDevpOpt/delete/auth")
+ @ManagerAuth
+ public R delete(@RequestParam(value="ids[]") Long[] ids){
+ for (Long id : ids){
+ basDevpOptService.deleteById(id);
+ }
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/basDevpOpt/export/auth")
+ @ManagerAuth
+ public R export(@RequestBody JSONObject param){
+ EntityWrapper<BasDevpOpt> wrapper = new EntityWrapper<>();
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ Map<String, Object> map = excludeTrash(param.getJSONObject("basDevpOpt"));
+ convert(map, wrapper);
+ List<BasDevpOpt> list = basDevpOptService.selectList(wrapper);
+ return R.ok(exportSupport(list, fields));
+ }
+
+ @RequestMapping(value = "/basDevpOptQuery/auth")
+ @ManagerAuth
+ public R query(String condition) {
+ EntityWrapper<BasDevpOpt> wrapper = new EntityWrapper<>();
+ wrapper.like("id", condition);
+ Page<BasDevpOpt> page = basDevpOptService.selectPage(new Page<>(0, 10), wrapper);
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (BasDevpOpt basDevpOpt : page.getRecords()){
+ Map<String, Object> map = new HashMap<>();
+ map.put("id", basDevpOpt.getId());
+ map.put("value", basDevpOpt.getId());
+ result.add(map);
+ }
+ return R.ok(result);
+ }
+
+ @RequestMapping(value = "/basDevpOpt/check/column/auth")
+ @ManagerAuth
+ public R query(@RequestBody JSONObject param) {
+ Wrapper<BasDevpOpt> wrapper = new EntityWrapper<BasDevpOpt>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
+ if (null != basDevpOptService.selectOne(wrapper)){
+ return R.parse(BaseRes.REPEAT).add(getComment(BasDevpOpt.class, String.valueOf(param.get("key"))));
+ }
+ return R.ok();
+ }
+ /**
+ * 鍏ㄥ瓧娈垫ā绯婃悳绱�
+ * @param cls 妯″瀷绫�
+ * @param set 鎺掗櫎瀛楁闆嗗悎
+ * @param condition 鎼滅储鍐呭
+ */
+ protected <T> void allLike(Class<T> cls, Set<String> set, EntityWrapper<T> wrapper, String condition){
+ if (Cools.isEmpty(condition)) {
+ return;
+ }
+ List<String> columns = new ArrayList<>();
+ for (Field field :Cools.getAllFields(cls)){
+ if (Modifier.isFinal(field.getModifiers())
+ || Modifier.isStatic(field.getModifiers())
+ || Modifier.isTransient(field.getModifiers())){
+ continue;
+ }
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ column = field.getAnnotation(TableField.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = field.getName();
+ }
+ if (!set.contains(column)) {
+ columns.add(column);
+ }
+ }
+ if (columns.isEmpty()) {
+ return;
+ }
+ for (int i=0;i<columns.size();i++){
+ if (i==0){
+ wrapper.andNew();
+ } else {
+ wrapper.or();
+ }
+ wrapper.like(columns.get(i), condition);
+ }
+ }
+
+}
diff --git a/src/main/java/com/zy/asrs/entity/BasDevpOpt.java b/src/main/java/com/zy/asrs/entity/BasDevpOpt.java
new file mode 100644
index 0000000..55d286f
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/BasDevpOpt.java
@@ -0,0 +1,174 @@
+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.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.enums.IdType;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.baomidou.mybatisplus.annotations.TableName;
+import java.io.Serializable;
+
+@Data
+@TableName("asr_bas_devp_opt")
+public class BasDevpOpt implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * 浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "浠诲姟鍙�")
+ @TableField("wrk_no")
+ private Integer wrkNo;
+
+ /**
+ * 涓嬪彂鏃堕棿
+ */
+ @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @TableField("send_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date sendTime;
+
+ /**
+ * 婧愮珯
+ */
+ @ApiModelProperty(value= "婧愮珯")
+ @TableField("source_sta")
+ private Integer sourceSta;
+
+ /**
+ * 鐩爣绔�
+ */
+ @ApiModelProperty(value= "鐩爣绔�")
+ @TableField("pos_sta")
+ private Integer posSta;
+
+ /**
+ * 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
+ */
+ @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ private Integer response;
+
+ /**
+ * 淇敼鏃堕棿
+ */
+ @ApiModelProperty(value= "淇敼鏃堕棿")
+ @TableField("update_time")
+ @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ private Date updateTime;
+
+ /**
+ * 婧愮珯鏈夌墿鐘舵��
+ */
+ @ApiModelProperty(value= "婧愮珯鏈夌墿鐘舵��")
+ @TableField("source_loading")
+ private String sourceLoading;
+
+ /**
+ * 鐩爣绔欐湁鐗╃姸鎬�
+ */
+ @ApiModelProperty(value= "鐩爣绔欐湁鐗╃姸鎬�")
+ @TableField("pos_loading")
+ private String posLoading;
+
+ @ApiModelProperty(value= "")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty(value= "")
+ private String barcode;
+
+ @ApiModelProperty(value= "")
+ @TableField("front_err")
+ private Long frontErr;
+
+ @ApiModelProperty(value= "")
+ @TableField("back_err")
+ private Long backErr;
+
+ @ApiModelProperty(value= "")
+ @TableField("high_err")
+ private Long highErr;
+
+ @ApiModelProperty(value= "")
+ @TableField("left_err")
+ private Long leftErr;
+
+ @ApiModelProperty(value= "")
+ @TableField("right_err")
+ private Long rightErr;
+
+ @ApiModelProperty(value= "")
+ @TableField("barcode_err")
+ private Long barcodeErr;
+
+ public BasDevpOpt() {}
+
+ public BasDevpOpt(Integer wrkNo,Date sendTime,Integer sourceSta,Integer posSta,Date updateTime,String sourceLoading,String barcode,Long frontErr,Long backErr,Long highErr,Long leftErr,Long rightErr,Long barcodeErr) {
+ this.wrkNo = wrkNo;
+ this.sendTime = sendTime;
+ this.sourceSta = sourceSta;
+ this.posSta = posSta;
+ this.updateTime = updateTime;
+ this.sourceLoading = sourceLoading;
+ this.barcode = barcode;
+ this.frontErr = frontErr;
+ this.backErr = backErr;
+ this.highErr = highErr;
+ this.leftErr = leftErr;
+ this.rightErr = rightErr;
+ this.barcodeErr = barcodeErr;
+ }
+
+// BasDevpOpt basDevpOpt = new BasDevpOpt(
+// null, // 浠诲姟鍙�
+// null, // 涓嬪彂鏃堕棿
+// null, // 婧愮珯
+// null, // 鐩爣绔�
+// null, // 鍝嶅簲缁撴灉
+// null, // 淇敼鏃堕棿
+// null, // 婧愮珯鏈夌墿鐘舵��
+// null, // 鐩爣绔欐湁鐗╃姸鎬�
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null, //
+// null //
+// );
+
+ public String getSendTime$(){
+ if (Cools.isEmpty(this.sendTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.sendTime);
+ }
+
+ public String getResponse$(){
+ if (null == this.response){ return null; }
+ switch (this.response){
+ case 1:
+ return "姝ｅ父";
+ case 0:
+ return "澶辫触";
+ default:
+ return String.valueOf(this.response);
+ }
+ }
+
+ public String getUpdateTime$(){
+ if (Cools.isEmpty(this.updateTime)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ }
+
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java b/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java
new file mode 100644
index 0000000..9d835ab
--- /dev/null
+++ b/src/main/java/com/zy/asrs/mapper/BasDevpOptMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.mapper;
+
+import com.zy.asrs.entity.BasDevpOpt;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasDevpOptMapper extends BaseMapper<BasDevpOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
index 035f082..b4ded1c 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastStaMapper.java
@@ -42,5 +42,7 @@
List<WrkMastSta> selectLockWrk();
List<WrkMastSta> selectLockWrkT();
+ List<WrkMastSta> selectPakingWrk(@Param("staStart") Integer staStart);
+
}
diff --git a/src/main/java/com/zy/asrs/service/BasDevpOptService.java b/src/main/java/com/zy/asrs/service/BasDevpOptService.java
new file mode 100644
index 0000000..13d23b7
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/BasDevpOptService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.service;
+
+import com.zy.asrs.entity.BasDevpOpt;
+import com.baomidou.mybatisplus.service.IService;
+
+public interface BasDevpOptService extends IService<BasDevpOpt> {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastStaService.java b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
index 7d643f6..a5923b7 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastStaService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastStaService.java
@@ -9,4 +9,7 @@
List<WrkMastSta> selectLockWrk();
List<WrkMastSta> selectLockWrkT();
+ List<WrkMastSta> selectPakingWrk(Integer staStart);
+
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java
new file mode 100644
index 0000000..9f7d39c
--- /dev/null
+++ b/src/main/java/com/zy/asrs/service/impl/BasDevpOptServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.service.impl;
+
+import com.zy.asrs.mapper.BasDevpOptMapper;
+import com.zy.asrs.entity.BasDevpOpt;
+import com.zy.asrs.service.BasDevpOptService;
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basDevpOptService")
+public class BasDevpOptServiceImpl extends ServiceImpl<BasDevpOptMapper, BasDevpOpt> implements BasDevpOptService {
+
+}
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index d770187..7eb0fb0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -138,6 +138,9 @@
} else {
staProtocol = staProtocol.clone();
}
+ if(!staProtocol.isLoading()){
+ continue;
+ }
if (barcodeThread == null) {
continue;
@@ -180,7 +183,7 @@
}
// 閫�鍥�
if (back) {
-// News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
+ News.warn("鎵爜鍏ュ簱澶辫触锛寋}鍏ュ簱绔欏洜{}寮傚父锛屾墭鐩樺凡琚��鍥�", inSta.getStaNo(), errMsg);
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
if (!staProtocol.isLoading()){
@@ -194,10 +197,11 @@
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
}
staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
+ News.info("寮傚父鍒ゆ柇{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
wrkNo++;
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
+ staProtocol.setBarcode(barcode);
staProtocol.setPakMk(false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
System.out.println(staProtocol);
@@ -209,7 +213,8 @@
&& staProtocol.isLoading()
&& staProtocol.isInEnable()
&& !staProtocol.isEmptyMk()
- && staProtocol.isPakMk()) {
+ && staProtocol.isPakMk()
+ ) {
if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode)) {
// News.error(JSON.toJSONString(staProtocol));
News.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
@@ -219,9 +224,10 @@
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
}
staProtocol.setWorkNo(wrkNo);
- News.info("{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
+ News.info("鏉＄爜鍒ゆ柇{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
wrkNo++;
staProtocol.setStaNo(inSta.getBackSta().shortValue());
+ staProtocol.setBarcode(barcode);
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.error("杈撻�佺嚎涓嬪彂1锛�"+wrkNo+","+inSta.getBackSta());
@@ -248,9 +254,10 @@
if (wrkNo1 != 0){
News.error(barcode + "鏉＄爜宸插瓨鍦ㄧ姸鎬佷负锛� 2.璁惧涓婅蛋 锛夌殑鏁版嵁,璇锋煡鐪媁CS杈撻�佺嚎鐣岄潰,宸ヤ綔鍙�={}", wrkMast.getWrkNo());
StaProtocol staProtocolNew = new StaProtocol();
- staProtocolNew.setWorkNo(wrkNo1);
+ staProtocolNew.setWorkNo(wrkMast.getWrkNo());
staProtocolNew.setStaNo(RouteUtils.SouStaEnd(wrkMast.getStaNo(),wrkMast.getSourceStaNo()));
staProtocolNew.setSiteId(staProtocol.getSiteId());
+ staProtocolNew.setBarcode(barcode);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocolNew));
if (ledThread != null) {
News.error(methodName + ":鎵爜澶辫触锛岃閲嶈瘯");
@@ -261,6 +268,8 @@
barcodeThread.setBarcode("");
staProtocol.setWorkNo(wrkMast.getWrkNo());
staProtocol.setStaNo(RouteUtils.SouStaEnd(null,wrkMast.getSourceStaNo()));
+ staProtocol.setBarcode(barcode);
+
devpThread.setPakMk(staProtocol.getSiteId(), false);
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.info("杈撻�佺嚎涓嬪彂(瀛樺湪璁惧涓婅蛋鐨勫伐浣滄。锛岀洿鎺ヤ笅鍙戯紒))锛�"+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
@@ -349,7 +358,7 @@
staProtocol.setStaNo(inSta.getBackSta().shortValue());
devpThread.setPakMk(staProtocol.getSiteId(), false);
MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
-//
+ News.info("浠诲姟涓嬪彂鍒ゆ柇{}鍏ュ簱鍥為��锛歿}锛屼换鍔″彿锛歿}", inSta.getStaNo(), errMsg,wrkNo);
// if (ledThread != null) {
String errorMsg = jsonObject.getString("msg");
if (!Cools.isEmpty(errorMsg)) {
@@ -3063,6 +3072,7 @@
}
if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
rgvThread.setPaking(true);
+ continue;
}
//灏忚溅鏃犱换鍔℃椂璺宠繃
if(rgvProtocol.getTaskNo1() ==0 && rgvProtocol.getTaskNo2() == 0 ){
@@ -3106,26 +3116,31 @@
}
BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
basRgvMap.setNowRoute(rgvProtocol.getRgvPosI()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
- Integer workNo = rgvProtocol.getTaskNo2() !=0 ? rgvProtocol.getTaskNo2() : rgvProtocol.getTaskNo1(); //鍏ュ簱鏀捐揣浼樺厛宸ヤ綅2鎵ц
+ Integer workNo = 0;
+ if(rgvProtocol.getTaskNo2() > 9999|| rgvProtocol.getTaskNo1() > 9999){
+ workNo = rgvProtocol.getTaskNo1() !=0 ? rgvProtocol.getTaskNo1() : rgvProtocol.getTaskNo2();
+ }else{
+ workNo = rgvProtocol.getTaskNo2() !=0 ? rgvProtocol.getTaskNo2() : rgvProtocol.getTaskNo1();
+ }
WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNoPut(workNo);
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(workNo);
if( null == wrkMastSta ) {
News.infoNoLog( " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts0, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
continue;
}
-
-
boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
if (sign){
try{
rgvThread.setPaking(false);
- wrkMast.setSheetNo("2");
+ if(wrkMast != null){
+ wrkMast.setSheetNo("2");
+ wrkMastMapper.updateById(wrkMast);
+ }
wrkMastSta.setWrkSts(2);
wrkMastStaMapper.updateById(wrkMastSta);
- wrkMastMapper.updateById(wrkMast);
log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
}catch (Exception e){
- log.error("鏇存柊灏忚溅浠诲姟澶辫触");
+ log.error("鏇存柊灏忚溅浠诲姟澶辫触"+ e);
}
} else {
log.error("宸ヤ綔鍙穥}鎵�灞炰换鍔′笅鍙戝け璐�",wrkMastSta.getWrkNo());
@@ -3175,6 +3190,7 @@
}
WrkMastSta wrkMastSta = wrkMastStaMapper.selectByWrkNoPut(workNo);//鏍规嵁绔欑偣宸ヤ綔鍙峰拰灏忚溅宸ヤ綔鑼冨洿妫�绱换鍔℃。
+ WrkMast wrkMast = wrkMastMapper.selectByWrkNo(workNo);
if( null == wrkMastSta ) {
News.infoNoLog( " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍑哄簱鏁版嵁--wrk_sts0, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
@@ -3184,6 +3200,10 @@
if (sign){
try{
rgvThread.setPaking(false);
+ if(wrkMast != null){
+ wrkMast.setSheetNo("2");
+ wrkMastMapper.updateById(wrkMast);
+ }
wrkMastSta.setWrkSts(2);
wrkMastStaMapper.updateById(wrkMastSta);
log.error("鏇存柊灏忚溅浠诲姟鎴愬姛");
@@ -3412,8 +3432,12 @@
News.error("" + mark + " - 1" + " - 2" + " - 鍏ュ簱 ===>>Rgv绔欑偣鍦ㄦ暟鎹簱涓嶅瓨鍦�, 绔欑偣缂栧彿={}", rgvStn.getStaNo());
continue;
}
+
wrkMastSta3 = wrkMastStaMapper.selectByWrkNo(staProtocol2.getWorkNo());
}
+// if(rgvProtocol.getTaskNo2() > 9999){
+// continue;
+// }
if (staProtocol == null) {
News.infoNoLog("" + mark + " - 1" + " - 1" + " - Rgv鍏ュ簱绔欎俊鎭�(staProtocol!=null缁х画鎵ц)锛歴taProtocol=" + staProtocol);
@@ -3469,24 +3493,25 @@
boolean sign = false;
sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
if (sign){
- if(wrkMastSta3 != null){
- wrkMastSta3.setMk(1);
- basRgv.setPakAll("0");
- basRgvService.updateById(basRgv);
- try{
- wrkMastStaMapper.updateById(wrkMastSta3);
- log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
- }catch (Exception e){
- log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
+ if(wrkMastSta3 != null ){
+ List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
+ if(wrkMastStaPaking.size() < 1){//宸叉湁鏍囪涓嶅啀鏍囪
+ wrkMastSta3.setMk(1);
+ basRgv.setPakAll("0");
+ basRgvService.updateById(basRgv);
+
+ try{
+ wrkMastStaMapper.updateById(wrkMastSta3);
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
+ }catch (Exception e){
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
+ }
}
-
}
- basRgv.setPakOut("0");
+ basRgv.setPakOut("0");//鍑哄簱涓嶅厑璁�
basRgvService.updateById(basRgv);
- rgvThread.setPaking(false);
-// rgvThread.setPakOut(false);//鍑哄簱涓嶅厑璁�
-// basRgvService.updateById(basRgv);
+ rgvThread.setPaking(false);//浠诲姟涓嬪彂閿佸畾
try{
wrkMastSta.setWrkSts(1);
@@ -3568,6 +3593,7 @@
case 2: route = RouteUtils.getRouteTwo();break;
}
basRgvMap.setNowRoute(rgvProtocol.getRgvPosI2()); //鏇存柊灏忚溅褰撳墠浣嶇疆绔欑偣鍙�
+ basRgvMapService.updateById(basRgvMap);
WrkMastSta wrkMastSta = wrkMastStaMapper.selectNoInterfere(route, route, Long.valueOf(staProtocol.getWorkNo()));//鏍规嵁绔欑偣宸ヤ綔鍙峰拰灏忚溅宸ヤ綔鑼冨洿妫�绱换鍔℃。
if( null == wrkMastSta ) {
News.infoNoLog("" + mark + " - 1" + " - 4" + " - 鏌ヨ鏃犲緟鍏ュ簱鏁版嵁--wrk_sts0, 宸ヤ綔鍙�={}", staProtocol.getWorkNo());
@@ -3596,15 +3622,20 @@
// rgvThread.setPakToCrn(false); //閿佸畾灏忚溅鍙兘鎺ユ帴椹充换鍔�
}
- if(wrkMastSta3 != null){
- wrkMastSta3.setMk(1);
- try{
- wrkMastStaMapper.updateById(wrkMastSta3);
- log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
- }catch (Exception e){
- log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
- }
+ if(wrkMastSta3 != null ){
+ List<WrkMastSta> wrkMastStaPaking = wrkMastStaService.selectPakingWrk(wrkMastSta3.getStaStart());
+ if(wrkMastStaPaking.size() < 1){
+ wrkMastSta3.setMk(1);
+ basRgv.setPakAll("0");
+ basRgvService.updateById(basRgv);
+ try{
+ wrkMastStaMapper.updateById(wrkMastSta3);
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟");
+ }catch (Exception e){
+ log.error("閿佸畾鐩搁殧绔欑偣浠诲姟澶辫触");
+ }
+ }
}
basRgv.setPakIn("0");
basRgvService.updateById(basRgv);
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
index 4c0ffab..b7ed191 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastStaServiceImpl.java
@@ -18,4 +18,8 @@
public List<WrkMastSta> selectLockWrkT(){
return this.baseMapper.selectLockWrkT();
}
+ @Override
+ public List<WrkMastSta> selectPakingWrk(Integer staStart){
+ return this.baseMapper.selectPakingWrk(staStart);
+ }
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 8a804a7..45dafed 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -10,9 +10,13 @@
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.BasDevpOpt;
import com.zy.asrs.entity.BasRgvMap;
+import com.zy.asrs.entity.BasRgvOpt;
+import com.zy.asrs.service.BasDevpOptService;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.BasRgvMapService;
+import com.zy.asrs.service.BasRgvOptService;
import com.zy.common.utils.News;
import com.zy.core.DevpThread;
import com.zy.core.cache.MessageQueue;
@@ -558,6 +562,29 @@
log.error("鍐欏叆杈撻�佺嚎鍛戒护澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={},鍐欏叆娆℃暟={}", slave.getId(), JSON.toJSON(staProtocol), writeCount);
}
}while (writeCount<5);
+ try {
+ // 鏃ュ織璁板綍
+ BasDevpOptService bean = SpringUtils.getBean(BasDevpOptService.class);
+ BasDevpOpt basDevpOpt = new BasDevpOpt(
+ staProtocol.getWorkNo(),
+ new Date(),
+ staProtocol.getSiteId(),
+ (int)staProtocol.getStaNo(),
+ new Date(),
+ String.valueOf(staProtocol.isLoading()),
+ staProtocol.getBarcode(),
+ staProtocol.isFrontErr()? 1L:0L,
+ staProtocol.isBackErr()? 1L:0L,
+ staProtocol.isHighErr()? 1L:0L,
+ staProtocol.isLeftErr()? 1L:0L,
+ staProtocol.isRightErr()? 1L:0L,
+ staProtocol.isBarcodeErr()? 1L:0L
+
+ );
+ bean.insert(basDevpOpt);
+ } catch (Exception ignore) {
+ log.error(ignore.getMessage());
+ }
if (!write.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
diff --git a/src/main/resources/mapper/BasDevpOptMapper.xml b/src/main/resources/mapper/BasDevpOptMapper.xml
new file mode 100644
index 0000000..26f9d6f
--- /dev/null
+++ b/src/main/resources/mapper/BasDevpOptMapper.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.mapper.BasDevpOptMapper">
+
+ <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
+ <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasDevpOpt">
+ <result column="wrk_no" property="wrkNo" />
+ <result column="send_time" property="sendTime" />
+ <result column="source_sta" property="sourceSta" />
+ <result column="pos_sta" property="posSta" />
+ <result column="response" property="response" />
+ <result column="update_time" property="updateTime" />
+ <result column="source_loading" property="sourceLoading" />
+ <result column="pos_loading" property="posLoading" />
+ <result column="id" property="id" />
+ <result column="barcode" property="barcode" />
+ <result column="front_err" property="frontErr" />
+ <result column="back_err" property="backErr" />
+ <result column="high_err" property="highErr" />
+ <result column="left_err" property="leftErr" />
+ <result column="right_err" property="rightErr" />
+ <result column="barcode_err" property="barcodeErr" />
+
+ </resultMap>
+
+</mapper>
diff --git a/src/main/resources/mapper/WrkMastStaMapper.xml b/src/main/resources/mapper/WrkMastStaMapper.xml
index 749f852..f2f11b6 100644
--- a/src/main/resources/mapper/WrkMastStaMapper.xml
+++ b/src/main/resources/mapper/WrkMastStaMapper.xml
@@ -161,7 +161,11 @@
where wrk_sts > 0
and sta_end > 2000
</select>
-
+ <select id="selectPakingWrk" resultMap="BaseResultMap">
+ select * from asr_wrk_mast_sta
+ where mk = 1
+ and sta_start = #{staStart}
+ </select>
diff --git a/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js b/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js
new file mode 100644
index 0000000..aa5cd22
--- /dev/null
+++ b/src/main/webapp/static/js/basDevpOpt/basDevpOpt.js
@@ -0,0 +1,270 @@
+var pageCurr;
+layui.config({
+ base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin'], function(){
+ var table = layui.table;
+ var $ = layui.jquery;
+ var layer = layui.layer;
+ var layDate = layui.laydate;
+ var form = layui.form;
+ var admin = layui.admin;
+
+ // 鏁版嵁娓叉煋
+ tableIns = table.render({
+ elem: '#basDevpOpt',
+ headers: {token: localStorage.getItem('token')},
+ url: baseUrl+'/basDevpOpt/list/auth',
+ page: true,
+ limit: 15,
+ limits: [15, 30, 50, 100, 200, 500],
+ toolbar: '#toolbar',
+ cellMinWidth: 50,
+ height: 'full-120',
+ cols: [[
+ {type: 'checkbox'}
+ ,{field: 'wrkNo', align: 'center',title: '浠诲姟鍙�'}
+ ,{field: 'sendTime$', align: 'center',title: '涓嬪彂鏃堕棿'}
+ ,{field: 'sourceSta', align: 'center',title: '婧愮珯'}
+ ,{field: 'posSta', align: 'center',title: '鐩爣绔�'}
+ ,{field: 'response$', align: 'center',title: '鍝嶅簲缁撴灉'}
+ ,{field: 'updateTime$', align: 'center',title: '淇敼鏃堕棿'}
+ ,{field: 'sourceLoading', align: 'center',title: '婧愮珯鏈夌墿鐘舵��'}
+ ,{field: 'posLoading', align: 'center',title: '鐩爣绔欐湁鐗╃姸鎬�'}
+ ,{field: 'id', align: 'center',title: ''}
+ ,{field: 'barcode', align: 'center',title: ''}
+ ,{field: 'frontErr', align: 'center',title: ''}
+ ,{field: 'backErr', align: 'center',title: ''}
+ ,{field: 'highErr', align: 'center',title: ''}
+ ,{field: 'leftErr', align: 'center',title: ''}
+ ,{field: 'rightErr', align: 'center',title: ''}
+ ,{field: 'barcodeErr', align: 'center',title: ''}
+
+ ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+ ]],
+ request: {
+ pageName: 'curr',
+ pageSize: 'limit'
+ },
+ parseData: function (res) {
+ return {
+ 'code': res.code,
+ 'msg': res.msg,
+ 'count': res.data.total,
+ 'data': res.data.records
+ }
+ },
+ response: {
+ statusCode: 200
+ },
+ done: function(res, curr, count) {
+ if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ }
+ pageCurr=curr;
+ limit();
+ }
+ });
+
+ // 鐩戝惉鎺掑簭浜嬩欢
+ table.on('sort(basDevpOpt)', function (obj) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ searchData['orderByField'] = obj.field;
+ searchData['orderByType'] = obj.type;
+ tableIns.reload({
+ where: searchData,
+ page: {curr: 1}
+ });
+ });
+
+ // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(basDevpOpt)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id).data;
+ switch(obj.event) {
+ case 'addData':
+ showEditModel();
+ break;
+ case 'deleteData':
+ if (checkStatus.length === 0) {
+ layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+ return;
+ }
+ del(checkStatus.map(function (d) {
+ return d.id;
+ }));
+ break;
+ case 'exportData':
+ admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ var titles=[];
+ var fields=[];
+ obj.config.cols[0].map(function (col) {
+ if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+ titles.push(col.title);
+ fields.push(col.field);
+ }
+ });
+ var exportData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ exportData[this.name] = this.value;
+ });
+ var param = {
+ 'basDevpOpt': exportData,
+ 'fields': fields
+ };
+ $.ajax({
+ url: baseUrl+"/basDevpOpt/export/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: JSON.stringify(param),
+ dataType:'json',
+ contentType:'application/json;charset=UTF-8',
+ method: 'POST',
+ success: function (res) {
+ layer.closeAll();
+ if (res.code === 200) {
+ table.exportFile(titles,res.data,'xls');
+ } else if (res.code === 403) {
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ });
+ });
+ break;
+ }
+ });
+
+ // 鐩戝惉琛屽伐鍏蜂簨浠�
+ table.on('tool(basDevpOpt)', function(obj){
+ var data = obj.data;
+ switch (obj.event) {
+ case 'edit':
+ showEditModel(data);
+ break;
+ case "del":
+ del([data.id]);
+ break;
+ }
+ });
+
+ /* 寮圭獥 - 鏂板銆佷慨鏀� */
+ function showEditModel(mData) {
+ admin.open({
+ type: 1,
+ area: '600px',
+ title: (mData ? '淇敼' : '娣诲姞') + '璁㈠崟鐘舵��',
+ content: $('#editDialog').html(),
+ success: function (layero, dIndex) {
+ layDateRender(mData);
+ form.val('detail', mData);
+ form.on('submit(editSubmit)', function (data) {
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDevpOpt/"+(mData?'update':'add')+"/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: data.field,
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.close(dIndex);
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ }else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ return false;
+ });
+ $(layero).children('.layui-layer-content').css('overflow', 'visible');
+ layui.form.render('select');
+ }
+ });
+ }
+
+ /* 鍒犻櫎 */
+ function del(ids) {
+ layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+ skin: 'layui-layer-admin',
+ shade: .1
+ }, function (i) {
+ layer.close(i);
+ var loadIndex = layer.load(2);
+ $.ajax({
+ url: baseUrl+"/basDevpOpt/delete/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {ids: ids},
+ method: 'POST',
+ success: function (res) {
+ layer.close(loadIndex);
+ if (res.code === 200){
+ layer.msg(res.msg, {icon: 1});
+ tableReload();
+ } else if (res.code === 403){
+ top.location.href = baseUrl+"/";
+ } else {
+ layer.msg(res.msg, {icon: 2});
+ }
+ }
+ })
+ });
+ }
+
+ // 鎼滅储
+ form.on('submit(search)', function (data) {
+ pageCurr = 1;
+ tableReload(false);
+ });
+
+ // 閲嶇疆
+ form.on('submit(reset)', function (data) {
+ pageCurr = 1;
+ clearFormVal($('#search-box'));
+ tableReload(false);
+ });
+
+ // 鏃堕棿閫夋嫨鍣�
+ function layDateRender(data) {
+ setTimeout(function () {
+ layDate.render({
+ elem: '.layui-laydate-range'
+ ,type: 'datetime'
+ ,range: true
+ });
+ layDate.render({
+ elem: '#sendTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['sendTime\\$']:null
+ });
+ layDate.render({
+ elem: '#updateTime\\$',
+ type: 'datetime',
+ value: data!==undefined?data['updateTime\\$']:null
+ });
+
+ }, 300);
+ }
+ layDateRender();
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+ parent.layer.closeAll();
+});
+
+function tableReload(child) {
+ var searchData = {};
+ $.each($('#search-box [name]').serializeArray(), function() {
+ searchData[this.name] = this.value;
+ });
+ tableIns.reload({
+ where: searchData,
+ page: {curr: pageCurr}
+ });
+}
diff --git a/src/main/webapp/views/basDevpOpt/basDevpOpt.html b/src/main/webapp/views/basDevpOpt/basDevpOpt.html
new file mode 100644
index 0000000..c05a640
--- /dev/null
+++ b/src/main/webapp/views/basDevpOpt/basDevpOpt.html
@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+ <meta charset="utf-8">
+ <title></title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+ <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+ <div class="layui-card">
+ <div class="layui-card-body">
+ <div class="layui-form toolbar" id="search-box">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline" style="width: 300px">
+ <div class="layui-input-inline">
+ <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline"> 
+ <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+ <i class="layui-icon"></i>鎼滅储
+ </button>
+ <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+ <i class="layui-icon"></i>閲嶇疆
+ </button>
+ </div>
+ </div>
+ </div>
+ <table class="layui-hide" id="basDevpOpt" lay-filter="basDevpOpt"></table>
+ </div>
+ </div>
+</div>
+
+<script type="text/html" id="toolbar">
+ <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>
+ </div>
+</script>
+
+<script type="text/html" id="operate">
+ <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+ <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basDevpOpt/basDevpOpt.js" charset="utf-8"></script>
+</body>
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+ <form id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+ <input name="id" type="hidden">
+ <div class="layui-row">
+ <div class="layui-col-md12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">浠诲姟鍙�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="wrkNo" placeholder="璇疯緭鍏ヤ换鍔″彿">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">涓嬪彂鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sendTime" id="sendTime$" placeholder="璇疯緭鍏ヤ笅鍙戞椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceSta" placeholder="璇疯緭鍏ユ簮绔�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="posSta" placeholder="璇疯緭鍏ョ洰鏍囩珯">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍝嶅簲缁撴灉: </label>
+ <div class="layui-input-block">
+ <select name="response">
+ <option value="">璇烽�夋嫨鍝嶅簲缁撴灉</option>
+ <option value="1">姝ｅ父</option>
+ <option value="0">澶辫触</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">淇敼鏃堕棿: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="updateTime" id="updateTime$" placeholder="璇疯緭鍏ヤ慨鏀规椂闂�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">婧愮珯鏈夌墿鐘舵��: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="sourceLoading" placeholder="璇疯緭鍏ユ簮绔欐湁鐗╃姸鎬�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐩爣绔欐湁鐗╃姸鎬�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="posLoading" placeholder="璇疯緭鍏ョ洰鏍囩珯鏈夌墿鐘舵��">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcode" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="frontErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="backErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="highErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="leftErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="rightErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="barcodeErr" placeholder="璇疯緭鍏�">
+ </div>
+ </div>
+
+ </div>
+ </div>
+ <hr class="layui-bg-gray">
+ <div class="layui-form-item text-right">
+ <button class="layui-btn" lay-filter="editSubmit" lay-submit="">淇濆瓨</button>
+ <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+ </div>
+ </form>
+</script>
+</html>
+
--
Gitblit v1.9.1