From 2c58889b757c50a2f74041e9790758b8e46e3a48 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 20 七月 2023 13:35:12 +0800
Subject: [PATCH] #中控：码垛完成下发入库信息 接口实装
---
src/main/webapp/static/js/locDetl/locDetl.js | 4
/dev/null | 61 ---------------
src/main/java/com/zy/asrs/entity/WaitPakin.java | 6 +
src/main/webapp/static/js/waitPakin/waitPakin.js | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 2
src/main/webapp/views/index.html | 2
src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java | 16 ++++
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 4
src/main/webapp/static/js/saas/locDetl.js | 6
src/main/webapp/static/js/common.js | 8 +-
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 85 +++++++++++++++++++++
src/main/webapp/static/js/waitPakinLog/waitPakinLog.js | 2
12 files changed, 121 insertions(+), 77 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index b81ae14..3005376 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -228,7 +228,7 @@
HttpServletRequest request) {
auth(appkey, param, request);
openService.palletizingComplete(param);
- return R.ok();
+ return R.ok(param);
}
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 21a45ed..a5810cb 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -58,6 +58,9 @@
@ApiModelProperty(value= "鍗曚环")
private Double price;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠辩紪鐮�
+ * */
@ApiModelProperty(value= "sku")
private String sku;
@@ -67,6 +70,9 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
+ /*
+ * 寰愬伐姹変簯涓婇ザ姹熼摐锛氭湪绠变綅缃�
+ * */
@ApiModelProperty(value= "浜у湴")
private String origin;
diff --git a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
index 44fc614..f236e11 100644
--- a/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/PalletizingCompleteParam.java
@@ -1,5 +1,6 @@
package com.zy.asrs.entity.param;
+import com.core.common.Cools;
import lombok.Data;
import java.util.List;
@@ -27,5 +28,20 @@
private String specs;// (鏄惁闇�瑕侊級 瀛楃涓� 瑙勬牸
}
+ public Integer getDevNo$(){
+ if (!Cools.isEmpty(this.palletizingNo)){
+ switch (this.palletizingNo){
+ case "1":
+ return 220;
+ case "2":
+ return 216;
+ case "3":
+ return 118;
+ default:
+ return null;
+ }
+ }
+ return null;
+ }
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 21b3910..3d88baa 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -54,6 +54,8 @@
private BasDevpService basDevpService;
@Autowired
private WrkDetlService wrkDetlService;
+ @Autowired
+ private WaitPakinService waitPakinService;
@Override
@Transactional
@@ -625,7 +627,7 @@
}
BasDevp basDevp = basDevpService.selectById(param.getDevNo());
if (Cools.isEmpty(basDevp)){
- throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo涓嶅瓨鍦�");
+ throw new CoolException("鍙傛暟锛氱珯鐐瑰彿 devNo="+param.getDevNo()+"涓嶅瓨鍦�");
}else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0 ){
throw new CoolException("绔欑偣:"+param.getDevNo()+" 涓嶅瓨鍦ㄥ伐浣滀腑浠诲姟");
}else if(!basDevp.getWrkNo().toString().equals(param.getWrkNo())){
@@ -661,6 +663,87 @@
@Override
@Transactional
public void palletizingComplete(PalletizingCompleteParam param) {
+ Long userId = 7777L;//涓帶
+ //鍒ゆ柇param鍙傛暟
+ if (Cools.isEmpty(param.getBarcode())){
+ throw new CoolException("鍙傛暟锛氭墭鐩樼爜 barcode涓虹┖");
+ }else if (Cools.isEmpty(param.getPalletizingNo())){
+ throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo涓虹┖");
+ }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
+ throw new CoolException("鍙傛暟锛氱墿鏂欐槑缁� matLists涓虹┖");
+ }
+ //鍒ゆ柇matLists鍙傛暟
+ for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ if (Cools.isEmpty(matList.getMatnr())){
+ throw new CoolException("鍙傛暟锛氱墿鏂欑紪鐮� matnr涓虹┖");
+ }else if (Cools.isEmpty(matList.getPosition())){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鐮佸灈浣嶇疆 position涓虹┖");
+ }else if (Cools.isEmpty(matList.getBoxNo())){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ缂栧彿 boxNo涓虹┖");
+ }else if (Cools.isEmpty(matList.getAnfme()) || matList.getAnfme().equals(0)){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細鏈ㄧ涓摐绠旀暟閲� anfme涓虹┖");
+ }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
+ throw new CoolException("鐗╂枡缂栫爜锛�"+matList.getMatnr()+"銆佸弬鏁帮細閲嶉噺 weight涓虹┖");
+ }
+ }
+
+// BasDevp basDevp = basDevpService.selectById(Integer.parseInt(param.getDevNo$()));
+// if (Cools.isEmpty(basDevp)){
+// throw new CoolException("鍙傛暟锛氱爜鍨涗綅缂栧彿 palletizingNo="+param.getPalletizingNo()+"涓嶅瓨鍦�");
+// }
+// if (Cools.isEmpty(basDevp.getAutoing()) || !basDevp.getAutoing().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄嚜鍔ㄧ姸鎬�");
+// }
+// if (Cools.isEmpty(basDevp.getLoading()) || !basDevp.getLoading().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄湁鐗╃姸鎬�");
+// }
+// if (Cools.isEmpty(basDevp.getCanining()) || !basDevp.getCanining().equals("Y")){
+// throw new CoolException("鐮佸灈浣嶇紪鍙� palletizingNo="+param.getPalletizingNo()+" 鎵�澶勭珯鐐逛笉鏄兘鍏ョ姸鎬�");
+// }
+
+
+ WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",201).eq("barcode", param.getBarcode()).eq("sta_no",param.getDevNo$()));
+ if (Cools.isEmpty(wrkMast) || !wrkMast.getWrkSts().equals(42L)){
+ throw new CoolException("鏌ヨ鎵樼洏澶辫触");
+ }else {
+ wrkMast.setWrkSts(wrkMast.getWrkSts()+1);
+ }
+
+
+ if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
+ || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
+ || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
+ throw new CoolException("鎵樼洏鏉＄爜锛�"+param.getBarcode()+"宸插瓨鍦紝璇峰嬁閲嶅缁勬墭");
+ }
+
+
+ Date now = new Date();
+ for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
+ Mat mat = matService.selectByMatnr(matList.getMatnr());
+ if (Cools.isEmpty(mat)) {
+ throw new CoolException(matList.getMatnr() + "鍟嗗搧妗ｆ涓嶅瓨鍦�");
+ }
+ WaitPakin waitPakin = new WaitPakin();
+ waitPakin.sync(mat);
+ waitPakin.setBatch(matList.getBatch()); //鎵规
+ waitPakin.setSpecs(matList.getSpecs()); //瑙勬牸
+ waitPakin.setSku(matList.getBoxNo()); //鏈ㄧ缂栫爜
+ waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
+ waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
+ waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
+ waitPakin.setAnfme(matList.getAnfme().doubleValue()); // 鏈ㄧ涓摐绠旀暟閲�
+ waitPakin.setStatus("Y"); // 鐘舵��
+ waitPakin.setAppeUser(userId);
+ waitPakin.setAppeTime(now);
+ waitPakin.setModiUser(userId);
+ waitPakin.setModiTime(now);
+ if (!waitPakinService.insert(waitPakin)) {
+ throw new CoolException("淇濆瓨鍏ュ簱閫氱煡妗ｅけ璐�");
+ }
+ }
+ if (!wrkMastService.updateById(wrkMast)){
+ throw new CoolException("寮傚父锛岃閲嶆柊鐢宠");
+ }
}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 8480456..d59f96b 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -193,10 +193,10 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
@@ -235,10 +235,10 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 820c6c7..325b459 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -14,10 +14,10 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index ff281b0..42a89ee 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -14,10 +14,10 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 9bd259e..08e9364 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -4,7 +4,7 @@
{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, hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true , hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
@@ -14,10 +14,10 @@
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'sku', align: 'center',title: 'sku', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
diff --git a/src/main/webapp/static/js/waitPakin/waitPakin.js b/src/main/webapp/static/js/waitPakin/waitPakin.js
index 4027f58..241715d 100644
--- a/src/main/webapp/static/js/waitPakin/waitPakin.js
+++ b/src/main/webapp/static/js/waitPakin/waitPakin.js
@@ -16,7 +16,7 @@
return html;
}}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:false})
return cols;
}
diff --git a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
index 54fc129..08559e3 100644
--- a/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
+++ b/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -16,7 +16,7 @@
return html;
}}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide:true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:true})
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide:false})
return cols;
}
layui.use(['table','laydate', 'form'], function(){
diff --git a/src/main/webapp/static/layuiadmin/json/table/demo.js b/src/main/webapp/static/layuiadmin/json/table/demo.js
deleted file mode 100644
index 8f90d90..0000000
--- a/src/main/webapp/static/layuiadmin/json/table/demo.js
+++ /dev/null
@@ -1,96 +0,0 @@
-
-{
- "code": 0
- ,"msg": ""
- ,"count": 3000000
- ,"data": [{
- "id": "10001"
- ,"username": "鏉滅敨"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "鐐瑰嚮姝ゅ锛屾樉绀烘洿澶氥�傚綋鍐呭瓒呭嚭鏃讹紝鐐瑰嚮鍗曞厓鏍间細鑷姩鏄剧ず鏇村鍐呭銆�"
- ,"experience": "116"
- ,"ip": "192.168.0.8"
- ,"logins": "108"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10002"
- ,"username": "鏉庣櫧"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "鍚涗笉瑙侊紝榛勬渤涔嬫按澶╀笂鏉ワ紝濂旀祦鍒版捣涓嶅鍥炪�� 鍚涗笉瑙侊紝楂樺爞鏄庨暅鎮茬櫧鍙戯紝鏈濆闈掍笣鏆垚闆�� 浜虹敓寰楁剰椤诲敖娆紝鑾娇閲戞ń绌哄鏈堛�� 澶╃敓鎴戞潗蹇呮湁鐢紝鍗冮噾鏁ｅ敖杩樺鏉ャ�� 鐑圭緤瀹扮墰涓斾负涔愶紝浼氶』涓�楗笁鐧炬澂銆� 宀戝か瀛愶紝涓逛笜鐢燂紝灏嗚繘閰掞紝鏉帿鍋溿�� 涓庡悰姝屼竴鏇诧紝璇峰悰涓烘垜鍊捐�冲惉銆�(鍊捐�冲惉 涓�浣滐細渚ц�冲惉) 閽熼紦棣旂帀涓嶈冻璐碉紝浣嗘効闀块唹涓嶅閱掋��(涓嶈冻璐� 涓�浣滐細浣曡冻璐碉紱涓嶅閱� 涓�浣滐細涓嶆効閱�/涓嶇敤閱�) 鍙ゆ潵鍦ｈ搐鐨嗗瘋瀵烇紝鎯熸湁楗�呯暀鍏跺悕銆�(鍙ゆ潵 涓�浣滐細鑷彜锛涙儫 閫氾細鍞�) 闄堢帇鏄旀椂瀹村钩涔愶紝鏂楅厭鍗佸崈鎭ｆ璋戙�� 涓讳汉浣曚负瑷�灏戦挶锛屽緞椤绘步鍙栧鍚涢厡銆� 浜旇姳椹紝鍗冮噾瑁橈紝鍛煎効灏嗗嚭鎹㈢編閰掞紝涓庡皵鍚岄攢涓囧彜鎰併��"
- ,"experience": "12"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- ,"LAY_CHECKED": true
- }, {
- "id": "10003"
- ,"username": "鐜嬪媰"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "65"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10004"
- ,"username": "鏉庢竻鐓�"
- ,"email": "xianxin@layui.com"
- ,"sex": "濂�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "666"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10005"
- ,"username": "鍐板績"
- ,"email": "xianxin@layui.com"
- ,"sex": "濂�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "86"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10006"
- ,"username": "璐ゅ績"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "12"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10007"
- ,"username": "璐ゅ績"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "16"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }, {
- "id": "10008"
- ,"username": "璐ゅ績"
- ,"email": "xianxin@layui.com"
- ,"sex": "鐢�"
- ,"city": "娴欐睙鏉窞"
- ,"sign": "浜虹敓鎭颁技涓�鍦轰慨琛�"
- ,"experience": "106"
- ,"ip": "192.168.0.8"
- ,"logins": "106"
- ,"joinTime": "2016-10-14"
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/static/layuiadmin/json/table/demo2.js b/src/main/webapp/static/layuiadmin/json/table/demo2.js
deleted file mode 100644
index f6fae59..0000000
--- a/src/main/webapp/static/layuiadmin/json/table/demo2.js
+++ /dev/null
@@ -1,61 +0,0 @@
-
-{
- "code": 0
- ,"msg": ""
- ,"count": 66
- ,"data": [{
- "username": "寮犲皬涓�"
- ,"amount": 18
- ,"province": "娴欐睙"
- ,"city": "鏉窞"
- ,"zone": "瑗挎箹鍖�"
- ,"street": "瑗挎邯琛楅亾"
- ,"address": "瑗挎邯鑺卞洯"
- ,"house": "30鏍�1鍗曞厓"
- }, {
- "username": "鏉庡皬鍥�"
- ,"amount": 39
- ,"province": "姹熻嫃"
- ,"city": "鑻忓窞"
- ,"zone": "濮戣嫃鍖�"
- ,"street": "涓濈桓璺�"
- ,"address": "澶╁涔嬪煄"
- ,"house": "9骞�2鍗曞厓"
- }, {
- "username": "鐜嬪皬浜�"
- ,"amount": 8
- ,"province": "姹熻タ"
- ,"city": "鍗楁槍"
- ,"zone": "闈掑北婀栧尯"
- ,"street": "鑹炬邯婀栧姙浜嬪"
- ,"address": "涓叴鍜屽洯"
- ,"house": "1骞�3鍗曞厓"
- }, {
- "username": "璧靛皬鍏�"
- ,"amount": 16
- ,"province": "绂忓缓"
- ,"city": "娉夊窞"
- ,"zone": "涓版辰鍖�"
- ,"street": "鍗楁磱琛楅亾"
- ,"address": "鍗楁磱鏉�"
- ,"house": "6骞�1鍗曞厓"
- }, {
- "username": "瀛欏皬涓�"
- ,"amount": 12
- ,"province": "婀栧寳"
- ,"city": "姝︽眽"
- ,"zone": "姝︽槍鍖�"
- ,"street": "姝︽槍澶ч亾"
- ,"address": "涓ゆ箹鑺卞洯"
- ,"house": "16骞�2鍗曞厓"
- }, {
- "username": "鍛ㄥ皬鍏�"
- ,"amount": 11
- ,"province": "瀹夊窘"
- ,"city": "榛勫北"
- ,"zone": "榛勫北鍖�"
- ,"street": "姹ゅ彛闀�"
- ,"address": "娓╂硥鏉�"
- ,"house": "21鍙�"
- }]
-}
\ No newline at end of file
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index 2e28e8f..865a049 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -75,7 +75,7 @@
<div class="layui-body"></div>
<!-- 搴曢儴 -->
<div class="layui-footer layui-text">
- copyright 漏 2022 <a href="https://www.superton.cn/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.
+ copyright 漏 2022 <a href="https://zoneyung.com/" target="_blank">娴欐睙涓壃绔嬪簱鏈夐檺鍏徃</a> all rights reserved.
<span class="pull-right">Version 1.0.0</span>
</div>
--
Gitblit v1.9.1