From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态，显示清楚 （完成） 4. 站点保存报错， 修改人，创建人员显示 错误（完成） 5. agv入库不显示 历史库位记录 (完成) 6. 任务类型，应该为入库 (完成)
---
src/main/java/com/zy/asrs/controller/BasStationController.java | 2 +-
src/main/webapp/static/js/basStation/basStation.js | 2 +-
src/main/java/com/zy/asrs/entity/BasStation.java | 23 +++++++++++++++++++++++
src/main/webapp/static/js/locCache/locCache.js | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2 +-
src/main/webapp/static/js/common.js | 2 +-
src/main/webapp/views/locCache/locDetail.html | 1 -
src/main/resources/application.yml | 2 +-
src/main/webapp/static/js/basContainer/basContainer.js | 2 --
9 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasStationController.java b/src/main/java/com/zy/asrs/controller/BasStationController.java
index c562cc7..6badd52 100644
--- a/src/main/java/com/zy/asrs/controller/BasStationController.java
+++ b/src/main/java/com/zy/asrs/controller/BasStationController.java
@@ -67,7 +67,7 @@
basStation.setAppeUser(getUserId());
basStation.setModiUser(getUserId());
basStation.setIoTime(new Date());
-
+ basStation.setId(null);
basStationService.insert(basStation);
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/BasStation.java b/src/main/java/com/zy/asrs/entity/BasStation.java
index d2c4670..f2f4b9d 100644
--- a/src/main/java/com/zy/asrs/entity/BasStation.java
+++ b/src/main/java/com/zy/asrs/entity/BasStation.java
@@ -5,6 +5,8 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.asrs.enums.LocStsType;
import org.springframework.format.annotation.DateTimeFormat;
import com.core.common.SpringUtils;
import com.zy.system.service.UserService;
@@ -32,6 +34,7 @@
* 涓婚敭
*/
@ApiModelProperty(value= "涓婚敭")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -303,6 +306,26 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
+ public String getLocSts$() {
+ if (Cools.isEmpty(this.locSts)){
+ return null;
+ }
+ if (this.locSts.equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ return LocStsType.LOC_STS_TYPE_O.type + "." + LocStsType.LOC_STS_TYPE_O.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_R.type)) {
+ return LocStsType.LOC_STS_TYPE_R.type + "." + LocStsType.LOC_STS_TYPE_R.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_S.type)) {
+ return LocStsType.LOC_STS_TYPE_S.type + "." + LocStsType.LOC_STS_TYPE_S.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_F.type)) {
+ return LocStsType.LOC_STS_TYPE_F.type + "." + LocStsType.LOC_STS_TYPE_F.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_X.type)) {
+ return LocStsType.LOC_STS_TYPE_X.type + "." + LocStsType.LOC_STS_TYPE_X.desc;
+ } else if (this.locSts.equals(LocStsType.LOC_STS_TYPE_D.type)) {
+ return LocStsType.LOC_STS_TYPE_D.type + "." + LocStsType.LOC_STS_TYPE_D.desc;
+ }
+ return null;
+ }
+
public String getLocType1$(){
if (null == this.locType1){ return null; }
switch (this.locType1){
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index 59c0c8f..2c9a489 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -1374,7 +1374,7 @@
task.setWrkNo(workNo)
.setIoTime(new Date())
.setWrkSts(1L) // 宸ヤ綔鐘舵�侊細11.鐢熸垚鍑哄簱ID
- .setIoType(11) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
+ .setIoType(1) // 鍏ュ嚭搴撶姸鎬侊細 11.搴撴牸绉昏浇
.setTaskType("agv")
.setIoPri(10D)
.setLocNo(loc.getLocNo()) // 鐩爣搴撲綅
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 4069581..890bdc6 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -43,7 +43,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
call-setters-on-nulls: true
diff --git a/src/main/webapp/static/js/basContainer/basContainer.js b/src/main/webapp/static/js/basContainer/basContainer.js
index 9781c7c..7a7dc1e 100644
--- a/src/main/webapp/static/js/basContainer/basContainer.js
+++ b/src/main/webapp/static/js/basContainer/basContainer.js
@@ -148,8 +148,6 @@
title: '鍒濆鍖�',
content: $('#initContainer').html(),
success: function (layero, dIndex) {
- // layDateRender(mData);
- // form.val('detail', mData);
form.on('submit(initDo)', function (data) {
var loadIndex = layer.load(2);
$.ajax({
diff --git a/src/main/webapp/static/js/basStation/basStation.js b/src/main/webapp/static/js/basStation/basStation.js
index 7612216..8a05d33 100644
--- a/src/main/webapp/static/js/basStation/basStation.js
+++ b/src/main/webapp/static/js/basStation/basStation.js
@@ -25,7 +25,7 @@
, {field: 'devNo', align: 'center', title: '绔欑偣鍙板彿'}
, {field: 'decDesc', align: 'center', title: '璁惧鎻忚堪'}
, {field: 'area', align: 'center', title: '鍖哄煙'}
- , {field: 'locSts', align: 'center', title: '鐘舵��'}
+ , {field: 'locSts$', align: 'center', title: '鐘舵��'}
, {field: 'ioTime', align: 'center', title: '鍏ュ嚭搴撴椂闂�'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 42a5a42..4d9623f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -223,13 +223,13 @@
var cacheCols = [
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿锛堝搧鍙凤級', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', sort:true}
- ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸', hide: false}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
+ ,{field: 'batch', align: 'center',title: '璐у搧鐗瑰緛', sort:true}
,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�',hide: true,
templet: function(d) {
// 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
diff --git a/src/main/webapp/static/js/locCache/locCache.js b/src/main/webapp/static/js/locCache/locCache.js
index 311e76b..03c257d 100644
--- a/src/main/webapp/static/js/locCache/locCache.js
+++ b/src/main/webapp/static/js/locCache/locCache.js
@@ -23,12 +23,12 @@
cols: [[{type: 'checkbox'}, {field: 'locNo', align: 'center', title: '搴撲綅鍙�', width: 120}
, {field: 'barcode', align: 'center', title: '鎵樼洏鐮�'}
, {field: 'areaName', align: 'center', title: '搴撳尯鍚嶇О'}
- , {field: 'whsType$', align: 'center', title: '搴撲綅绫诲瀷'}
+ // , {field: 'whsType$', align: 'center', title: '搴撲綅绫诲瀷'}
, {field: 'locSts', align: 'center', title: '搴撲綅鐘舵��'}
, {field: 'row1', align: 'center', title: '鎺�'}
, {field: 'bay1', align: 'center', title: '鍒�'}
, {field: 'lev1', align: 'center', title: '灞�'}
- , {field: 'locType', align: 'center', title: '搴撲綅绫诲瀷'}
+ // , {field: 'locType', align: 'center', title: '搴撲綅绫诲瀷'}
, {field: 'sort', align: 'center', title: '浼樺厛绾�'}
, {field: 'modiUser$', align: 'center', title: '淇敼浜哄憳'}
, {field: 'modiTime$', align: 'center', title: '淇敼鏃堕棿'}
diff --git a/src/main/webapp/views/locCache/locDetail.html b/src/main/webapp/views/locCache/locDetail.html
index e509b24..48b34c0 100644
--- a/src/main/webapp/views/locCache/locDetail.html
+++ b/src/main/webapp/views/locCache/locDetail.html
@@ -32,7 +32,6 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
- , {field: 'ioTime$', align: 'center', title: '宸ヤ綔鏃堕棿'}
];
cols.push.apply(cols, cacheCols);
return cols;
--
Gitblit v1.9.1