From a04ddd7cc61969800aac6ca7bd4e77516a48b8a8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 15 八月 2022 17:02:14 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/ManLocDetl.java | 15 ++++++++-------
src/main/resources/mapper/ManLocDetlMapper.xml | 3 ++-
src/main/webapp/views/manLocDetl/manLocDetl.html | 2 +-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 4 ++--
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 5 ++++-
5 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ManLocDetl.java b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
index ce546a1..62ab257 100644
--- a/src/main/java/com/zy/asrs/entity/ManLocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/ManLocDetl.java
@@ -193,8 +193,8 @@
* 淇敼鏃堕棿
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
- @TableField("update_time")
- private Date updateTime;
+ @TableField("modi_time")
+ private Date modiTime;
/**
* 澶囨敞
@@ -204,7 +204,7 @@
public ManLocDetl() {}
- public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public ManLocDetl(Long hostId, String locNo,Long nodeId,String zpallet,Double anfme,String matnr,String maktx,String name,String specs,String model,String batch,String unit,String barcode,Long docId,String docNum,String custName,Integer itemNum,Integer count,Double weight,Integer status,Long createBy,Date createTime,Long updateBy,Date modiTime,String memo) {
this.hostId = hostId;
this.nodeId = nodeId;
this.zpallet = zpallet;
@@ -226,7 +226,7 @@
this.createBy = createBy;
this.createTime = createTime;
this.updateBy = updateBy;
- this.updateTime = updateTime;
+ this.modiTime = modiTime;
this.memo = memo;
}
@@ -316,10 +316,11 @@
return null;
}
- public String getUpdateTime$(){
- if (Cools.isEmpty(this.updateTime)){
+ public String getModiTime$(){
+ if (Cools.isEmpty(this.modiTime)){
return "";
}
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.updateTime);
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime);
}
+
}
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 c05df4d..0e0df7e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -189,6 +189,7 @@
@Override
public void onSale(CombParam param) {
+ Date now = new Date();
// 鑾峰彇搴撲綅鍙�
String locno = param.getLocno();
Node node = nodeService.selectByUuid(locno);
@@ -211,9 +212,11 @@
ManLocDetl manLocDetl = new ManLocDetl();
manLocDetl.setLocNo(locno);
manLocDetl.setNodeId(node.getId());
- manLocDetl.setMatnr(combMat.getMatnr());
+ manLocDetl.setMaktx(mat.getMaktx());
+ manLocDetl.setMatnr(mat.getMatnr());
manLocDetl.setBatch(combMat.getBatch());
manLocDetl.setAnfme(combMat.getAnfme());
+ manLocDetl.setModiTime(now);
if (!manLocDetlService.insert(manLocDetl)) {
throw new CoolException("鍟嗗搧涓婃灦澶辫触锛�");
}
diff --git a/src/main/resources/mapper/ManLocDetlMapper.xml b/src/main/resources/mapper/ManLocDetlMapper.xml
index f92d616..bfa79c1 100644
--- a/src/main/resources/mapper/ManLocDetlMapper.xml
+++ b/src/main/resources/mapper/ManLocDetlMapper.xml
@@ -28,7 +28,7 @@
<result column="create_by" property="createBy" />
<result column="create_time" property="createTime" />
<result column="update_by" property="updateBy" />
- <result column="update_time" property="updateTime" />
+ <result column="update_time" property="modiTime" />
<result column="memo" property="memo" />
</resultMap>
@@ -217,5 +217,6 @@
and a.host_id = #{hostId}
group by a.matnr
</select>
+ <select id="selectLocDetlSumQty" resultType="java.lang.Double"></select>
</mapper>
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index c1f1c61..ff281b0 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -1,13 +1,13 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
+ {field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ //,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'specs', align: 'center',title: '閰嶇疆'}
,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
diff --git a/src/main/webapp/views/manLocDetl/manLocDetl.html b/src/main/webapp/views/manLocDetl/manLocDetl.html
index 2089b1d..ffe7e56 100644
--- a/src/main/webapp/views/manLocDetl/manLocDetl.html
+++ b/src/main/webapp/views/manLocDetl/manLocDetl.html
@@ -105,7 +105,7 @@
<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-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;margin-right: -10px">瀵煎嚭</button>
</div>
</script>
--
Gitblit v1.9.1