From bef6c5cb4431e35008e55849ee7c0bd62acd4fbf Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期二, 09 七月 2024 20:21:33 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/locDetl/locDetl.js | 5 ++
src/main/java/com/zy/asrs/entity/LocDetl.java | 28 ++++++++++++++
src/main/java/com/zy/asrs/controller/OpenController.java | 4 +-
src/main/webapp/static/js/mat/mat.js | 3 +
src/main/resources/mapper/MatMapper.xml | 3 +
src/main/java/com/zy/asrs/entity/Mat.java | 18 +++++++++
6 files changed, 58 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 2cf1038..73eb219 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -33,7 +33,7 @@
@Autowired
private OpenService openService;
- /*@PostMapping("/order/matSync/default/v1")
+ @PostMapping("/order/matSync/default/v1")
@AppAuth(memo = "鍟嗗搧淇℃伅鍚屾鎺ュ彛")
public synchronized R syncMatInfo(@RequestHeader(required = false) String appkey,
@RequestBody(required = false) MatSyncParam param,
@@ -44,7 +44,7 @@
}
openService.syncMat(param);
return R.ok();
- }*/
+ }
/**
* 娣诲姞鍏ュ簱鍗�
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 03aa67d..d20773d 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -9,6 +9,7 @@
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasBoxTypeService;
import com.zy.asrs.service.LocMastService;
+import com.zy.asrs.service.MatService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -267,6 +268,33 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ public long getStoreDate(){
+ long timeNow = new Date().getTime();
+ long timeCreate = this.appeTime.getTime();
+
+ return (timeNow - timeCreate) /24/60/60/1000;
+ }
+
+ public String getStoreMax$(){
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getStoreMin());
+ }
+ return null;
+ }
+
+
+ public String getStoreMin$(){
+ MatService matService = SpringUtils.getBean(MatService.class);
+ Mat mat = matService.selectByMatnr(this.matnr);
+ if (!Cools.isEmpty(mat)){
+ return String.valueOf(mat.getStoreMax());
+ }
+ return null;
+ }
+
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index d06aea8..60a4e7e 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -307,6 +307,24 @@
@ExcelProperty(value = "澶囨敞")
private String memo;
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓婇檺
+ */
+ @TableField("store_max")
+ private Double storeMax;
+
+ /**
+ * 搴撳瓨棰勮鏁伴噺涓嬮檺
+ */
+ @TableField("store_min")
+ private Double storeMin;
+
+ /**
+ * 搴撻緞棰勮涓婇檺
+ */
+ @TableField("store_max_date")
+ private Integer storeMaxDate;
+
public Mat() {}
public Mat(String uuid,Long tagId,String matnr,String maktx,String name,String specs,String model,String color,String brand,String unit,Double price,String sku,Double units,String barcode,String origin,String manu,String manuDate,String itemNum,Double safeQty,Double weight,Double length,Double volume,String threeCode,String supp,String suppCode,Integer beBatch,String deadTime,Integer deadWarn,Integer source,Integer inspect,Integer danger,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
diff --git a/src/main/resources/mapper/MatMapper.xml b/src/main/resources/mapper/MatMapper.xml
index 09a8d0a..8284ac3 100644
--- a/src/main/resources/mapper/MatMapper.xml
+++ b/src/main/resources/mapper/MatMapper.xml
@@ -42,6 +42,9 @@
<result column="update_by" property="updateBy" />
<result column="update_time" property="updateTime" />
<result column="memo" property="memo" />
+ <result column="store_max" property="storeMax" />
+ <result column="store_min" property="storeMin" />
+ <result column="store_max_date" property="storeMaxDate" />
<result column="stock" property="stock" />
</resultMap>
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 5e624fb..9bfb532 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,7 +2,10 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
+ {field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', sort:true}
+ ,{field: 'storeMax$', align: 'center',title: '搴撳瓨涓婇檺'}
+ ,{field: 'storeMin$', align: 'center',title: '搴撳瓨涓嬮檺'}
+ ,{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
diff --git a/src/main/webapp/static/js/mat/mat.js b/src/main/webapp/static/js/mat/mat.js
index 0fa6ccc..2805440 100644
--- a/src/main/webapp/static/js/mat/mat.js
+++ b/src/main/webapp/static/js/mat/mat.js
@@ -5,6 +5,9 @@
var cols = [
{type: 'checkbox'}
,{field: 'tagId$', align: 'center',title: '褰掔被', templet: '#tagTpl'}
+ ,{field: 'store_max', align: 'center',title: '搴撳瓨涓婇檺'}
+ ,{field: 'store_min', align: 'center',title: '搴撳瓨涓嬮檺'}
+ ,{field: 'store_max_date', align: 'center',title: '搴撻緞涓婇檺(澶�)'}
];
cols.push.apply(cols, matCols);
cols.push(
--
Gitblit v1.9.1