From 2a6ffd8bfdb3d8234a55e7fabe71999f1dba4fd9 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期一, 05 九月 2022 18:32:08 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/entity/ProjectType.java | 8 ++++++--
src/main/webapp/views/item/item.html | 2 +-
src/main/webapp/views/projectType/projectType.html | 6 +++---
src/main/webapp/static/js/flowStatus/flowStatus.js | 6 +++++-
src/main/webapp/views/flowStatus/flowStatus.html | 9 +++++++++
src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java | 14 ++++++++++++++
src/main/java/zy/cloud/wms/manager/controller/ItemController.java | 4 ++++
src/main/resources/mapper/FlowStatusMapper.xml | 2 ++
src/main/webapp/static/js/item/item.js | 5 +++--
9 files changed, 47 insertions(+), 9 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
index f3ea386..61b6dce 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -115,6 +115,9 @@
/**
* 鎺х
*/
+ if (Cools.isEmpty(item.getHostId()) || item.getHostId() == 0){
+ item.setHostId(1L);
+ }
if (Cools.isEmpty(item)) {
return R.error("鍙傛暟涓虹┖,璇疯仈绯荤鐞嗗憳");
}
@@ -140,6 +143,7 @@
throw new CoolException("鎵句笉鍒拌瀹㈡埛,璇锋鏌�");
}
+
item.setCustMan(cstmr.getName());
item.setCustMobile(cstmr.getTel());
item.setCustAdress(cstmr.getAddr());
diff --git a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
index 1a96f61..0d74dbd 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/FlowStatus.java
@@ -61,6 +61,13 @@
@TableField("weight_num")
private Integer weightNum;
+ /**
+ * 0锛氬父瑙勯」鐩�
+ * 1锛氶泦鎴愰」鐩�
+ */
+ @TableField("is_asrs")
+ private Integer isAsrs;
+
// FlowStatus flowStatus = new FlowStatus(
// null, // 鑺傜偣绫诲瀷
@@ -71,6 +78,13 @@
// null //
// );
+ public String getIsAsrs$(){
+ if (this.isAsrs == 0) {
+ return "甯歌椤圭洰";
+ }else {
+ return "闆嗘垚椤圭洰";
+ }
+ }
public Integer getId() {
return id;
}
diff --git a/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java b/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
index 62a5bb0..13c8173 100644
--- a/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
+++ b/src/main/java/zy/cloud/wms/manager/entity/ProjectType.java
@@ -55,6 +55,10 @@
@TableField("str_3")
private String str3;
+ /**
+ * 0:甯歌椤圭洰
+ * 1:闆嗘垚椤圭洰
+ */
@TableField("is_asrs")
private Integer isAsrs;
@@ -88,9 +92,9 @@
public String getIsAsrs$(){
if (this.isAsrs == 0) {
- return "鍚�";
+ return "甯歌椤圭洰";
}else {
- return "鏄�";
+ return "闆嗘垚椤圭洰";
}
}
diff --git a/src/main/resources/mapper/FlowStatusMapper.xml b/src/main/resources/mapper/FlowStatusMapper.xml
index 48a6ab1..7b78d88 100644
--- a/src/main/resources/mapper/FlowStatusMapper.xml
+++ b/src/main/resources/mapper/FlowStatusMapper.xml
@@ -11,6 +11,8 @@
<result column="str1" property="str1" />
<result column="str2" property="str2" />
<result column="str3" property="str3" />
+ <result column="is_asrs" property="isAsrs" />
+
</resultMap>
diff --git a/src/main/webapp/static/js/flowStatus/flowStatus.js b/src/main/webapp/static/js/flowStatus/flowStatus.js
index 6e5a668..5e3eed0 100644
--- a/src/main/webapp/static/js/flowStatus/flowStatus.js
+++ b/src/main/webapp/static/js/flowStatus/flowStatus.js
@@ -21,11 +21,15 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox'}
- ,{field: 'id', align: 'center',title: '鍞竴id',width: 100}
+ ,{field: 'id', align: 'center',title: '鍞竴id',width: 100 , hide: true}
,{field: 'type', align: 'center',title: '鑺傜偣绫诲瀷', hide:true}
+
,{field: 'weightNum', align: 'center',title: '鏉冮噸鍊�', width: 100}
+ ,{field: 'isAsrs$', align: 'center', width: 100, title: '椤圭洰绫诲瀷'}
+
,{field: 'name', align: 'center',title: '鑺傜偣鍚嶇О'}
+
,{field: 'memo', align: 'center',title: '澶囨敞', width: 300}
// ,{field: 'str1', align: 'center',title: ''}
// ,{field: 'str2', align: 'center',title: ''}
diff --git a/src/main/webapp/static/js/item/item.js b/src/main/webapp/static/js/item/item.js
index 3c289a9..58e08f0 100644
--- a/src/main/webapp/static/js/item/item.js
+++ b/src/main/webapp/static/js/item/item.js
@@ -30,14 +30,15 @@
// ,{field: 'cstmrUuid', align: 'center',title: '瀹㈡埛缂栧彿'}
,{field: 'cstmrUuid$', align: 'center',title: '瀹㈡埛鍚嶇О'}
,{field: 'projectStatus$', align: 'center', title: '椤圭洰杩涘害'}
- ,{field: 'orderDesc', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪', width: 115}
+ ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+ // ,{field: 'type', align: 'center', title: '璁㈠崟绫诲瀷鎻忚堪', width: 115}
// ,{field: 'member', align: 'center',title: '椤圭洰鎴愬憳'}
// ,{field: 'leader', align: 'center',title: '椤圭洰缁忕悊'}
,{field: 'startTime0$', align: 'center',title: '璁″垝寮�濮嬫椂闂�', width: 115}
,{field: 'endTime0$', align: 'center',title: '璁″垝缁撴潫鏃堕棿', width: 115}
,{field: 'realStartTime0$', align: 'center', title: '瀹為檯寮�濮嬫椂闂�', width: 115}
,{field: 'realEndTime0$', align: 'center', title: '瀹為檯缁撴潫鏃堕棿', width: 115}
- ,{field: 'type$', align: 'center', title: '椤圭洰绫诲瀷'}
+
,{field: 'originArea', align: 'center', title: '鐢熶骇鍦�'}
,{field: 'realMonth', align: 'center', title: '鏃堕棿璺ㄥ害(澶�)', width: 115}
,{field: 'dutyMan', align: 'center', title: '璐ｄ换浜�'}
diff --git a/src/main/webapp/views/flowStatus/flowStatus.html b/src/main/webapp/views/flowStatus/flowStatus.html
index 8bd3393..a22dfcd 100644
--- a/src/main/webapp/views/flowStatus/flowStatus.html
+++ b/src/main/webapp/views/flowStatus/flowStatus.html
@@ -80,6 +80,15 @@
<input class="layui-input" name="memo" placeholder="璇疯緭鍏ュ娉�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷: </label>
+ <div class="layui-input-block">
+ <select name="isAsrs">
+ <option value="0">甯歌椤圭洰</option>
+ <option value="1">闆嗘垚椤圭洰</option>
+ </select>
+ </div>
+ </div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">: </label>-->
<!-- <div class="layui-input-block">-->
diff --git a/src/main/webapp/views/item/item.html b/src/main/webapp/views/item/item.html
index 1e6aa03..0b10f63 100644
--- a/src/main/webapp/views/item/item.html
+++ b/src/main/webapp/views/item/item.html
@@ -48,7 +48,7 @@
<script type="text/html" id="operate">
<!-- <a class="layui-btn layui-btn-normal layui-btn-xs btn-edit" lay-event="report">鐢熸垚鎬荤粨</a>-->
<a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="initPlan">鐢熸垚璁″垝鑺傜偣</a>
+<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="initPlan">鐢熸垚璁″垝鑺傜偣</a>-->
<!-- <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">绂佺敤</a>-->
</script>
diff --git a/src/main/webapp/views/projectType/projectType.html b/src/main/webapp/views/projectType/projectType.html
index 0463274..b048c56 100644
--- a/src/main/webapp/views/projectType/projectType.html
+++ b/src/main/webapp/views/projectType/projectType.html
@@ -93,11 +93,11 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鏄惁涓虹珛搴�: </label>
+ <label class="layui-form-label layui-form-required">椤圭洰绫诲瀷锛�</label>
<div class="layui-input-block">
<select name="isAsrs">
- <option value="0">鍚�</option>
- <option value="1">鏄�</option>
+ <option value="0">甯歌椤圭洰</option>
+ <option value="1">闆嗘垚椤圭洰</option>
</select>
</div>
</div>
--
Gitblit v1.9.1