From bf81b6e3600a49cb8621cd798db9aa521956bc6e Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 10 三月 2025 15:28:09 +0800
Subject: [PATCH] #接口开发
---
src/main/java/com/zy/asrs/service/WrkMastService.java | 2
src/main/java/com/zy/common/web/param/SearchLocParam.java | 6 +
src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java | 5 +
src/main/java/com/zy/asrs/task/WCSReportScheduler.java | 2
src/main/java/com/zy/asrs/mapper/WrkMastMapper.java | 2
src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java | 3
src/main/java/com/zy/common/web/WcsController.java | 82 ++++++++++++++-
src/main/java/com/zy/common/web/param/SearchEmptyParam.java | 37 +++++++
src/main/resources/license.lic | 0
src/main/webapp/static/layuiadmin/json/content/list.js | 124 ++++++++++++------------
10 files changed, 190 insertions(+), 73 deletions(-)
diff --git a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
index 3b0a327..ba86e1e 100644
--- a/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/WrkMastMapper.java
@@ -28,4 +28,6 @@
int saveWrkDetlLog(Integer workNo);
+// List<WrkMast> selectWrkMastWrkDetlMatnrBatch(@Param("ioType") Integer ioType, @Param("matnr") String matnr , @Param("batch") String batch , @Param("grade") String grade , @Param("crnNo") Integer crnNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/WrkMastService.java b/src/main/java/com/zy/asrs/service/WrkMastService.java
index 481b521..4945d55 100644
--- a/src/main/java/com/zy/asrs/service/WrkMastService.java
+++ b/src/main/java/com/zy/asrs/service/WrkMastService.java
@@ -26,4 +26,6 @@
List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);
+// List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade,Integer crnNo);
+
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
index 374f295..a1d9aad 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastServiceImpl.java
@@ -54,4 +54,9 @@
public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) {
return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo);
}
+
+// @Override
+// public List<WrkMast> selectWrkMastWrkDetlMatnrBatch(Integer ioType,String matnr , String batch ,String grade ,Integer crnNo) {
+// return this.baseMapper.selectWrkMastWrkDetlMatnrBatch(ioType,matnr,batch,grade,crnNo);
+// }
}
diff --git a/src/main/java/com/zy/asrs/task/WCSReportScheduler.java b/src/main/java/com/zy/asrs/task/WCSReportScheduler.java
index f604ed8..89a500f 100644
--- a/src/main/java/com/zy/asrs/task/WCSReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WCSReportScheduler.java
@@ -36,7 +36,7 @@
List<WrkMast> wrkMastList=wrkMastService.selectList(new EntityWrapper<WrkMast>());
int i=1;
for(WrkMast wrkMast:wrkMastList){
- if (wrkMast.getWrkSts()==0){
+ if (wrkMast.getWrkSts() == 0 || wrkMast.getWrkSts() == 14){
wcsReportHandler.start(wrkMast,i);
i++;
}
diff --git a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
index d9c1e8f..f92acd1 100644
--- a/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WCSReportHandler.java
@@ -54,7 +54,8 @@
WorkIssuedResult.Tasks task = new WorkIssuedResult.Tasks();
task.setTaskId(wrkMast.getWrkNo().toString());
task.setBarCode(wrkMast.getBarcode());
- task.setOrder(i);
+// task.setOrder(i);
+ task.setOrder((int) (100 - wrkMast.getIoPri()));
//浼樺厛绾ф帓搴� 15.鍑哄簱>14.鍏ュ簱>13.绌烘澘鍑哄簱>12.绌烘澘鍏ュ簱>11.绉诲簱
if(wrkMast.getIoType() == 1 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57){//鍏ュ簱
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index 3bc9a83..fa70d1e 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -17,6 +17,7 @@
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
+import com.zy.common.web.param.SearchEmptyParam;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +71,10 @@
private String url;
@Value("${wcs-slave.loc}")
private String loc;
+ @Value("${wcs-slave.warehouse}")
+ private String warehouse;
+ //鍏ㄦ澘鍏ュ簱
@PostMapping("/fromwcs/inware-task")
@ResponseBody
public synchronized Re getLocNo(@RequestBody SearchLocParam param) {
@@ -81,6 +85,12 @@
if (Cools.isEmpty(param.getFromPort())) {
return Re.error("婧愮珯缂栧彿涓嶈兘涓虹┖");
}
+ if(Cools.isEmpty(param.getWarehouse())){
+ return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+ }
+ if(!param.getWarehouse().equals(warehouse)){
+ return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+ }
List<WaitPakin> waitPakins = null;
if (param.getFromPort().equals("101")) {
@@ -90,7 +100,7 @@
return Re.error("鏈夌┖鏉垮嚭搴撳埌100绔欐椂鏃剁姝㈠叆搴�");
}
- if (Cools.isEmpty(param.getBarCode()) && param.getIoType() != 10) {
+ if (Cools.isEmpty(param.getBarCode())) {
return Re.error("鏉＄爜涓嶈兘涓虹┖");
}
waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarCode()));
@@ -128,20 +138,48 @@
LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
StartupDto dto = null;
+
+ //鍏ㄦ澘鍏ュ簱
+ param.setIoType(1);
+
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert waitPakins != null;
dto = startupFullPutStore(Integer.valueOf(param.getFromPort()), param.getBarCode(), locTypeDto, waitPakins);
break;
- case 10://绌烘墭鐩樺叆搴�
- dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
- break;
+// case 10://绌烘墭鐩樺叆搴�
+// dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto, param.getBarCode());
+// break;
default:
break;
}
log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto, param.getBarCode());
return Re.ok();
}
+
+ @PostMapping("/fromwcs/empty-pallet-task")
+ @ResponseBody
+ public synchronized Re getLocNo(@RequestBody SearchEmptyParam param) {
+ log.info("鏀跺埌WCS绌烘澘鍏ュ簱鎺ュ彛璇锋眰====>>鍏ュ弬:{}", param);
+ if(Cools.isEmpty(param.getWarehouse())){
+ return Re.error("浠撳簱缂栧彿涓嶈兘涓虹┖");
+ }
+ if(!param.getWarehouse().equals(warehouse)){
+ return Re.error("浠撳簱缂栧彿涓嶅尮閰�");
+ }
+
+ // 婧愮珯鐐圭姸鎬佹娴�
+ BasDevp sourceStaNo = basDevpService.checkSiteStatus(Integer.valueOf(param.getFromPort()), true);
+ LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);
+
+ StartupDto dto = null;
+
+ dto = emptyPlateIn(Integer.valueOf(param.getFromPort()), locTypeDto);
+ log.info("WCS鍏ュ簱鎺ュ彛杩斿弬:{},鎵樼洏鐮�:{}", dto);
+ return Re.ok();
+ }
+
+
@PostMapping("/auto/emptyIn/v1")
@ResponseBody
@@ -279,7 +317,7 @@
}
@Transactional
- public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto, String barcode) {
+ public StartupDto emptyPlateIn(Integer devpNo, LocTypeDto locTypeDto) {
// 婧愮珯鐐圭姸鎬佹娴�
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
@@ -301,7 +339,6 @@
wrkMast.setExitMk("N"); // 閫�鍑�
wrkMast.setEmptyMk("Y"); // 绌烘澘
wrkMast.setLinkMis("Y");
- wrkMast.setBarcode(barcode);
wrkMast.setCtnType(sourceStaNo.getCtnType()); // 瀹瑰櫒绫诲瀷
// 鎿嶄綔浜哄憳鏁版嵁
wrkMast.setAppeTime(new Date());
@@ -422,8 +459,10 @@
throw new CoolException("淇敼搴撲綅鐘舵�佸け璐�");
}
wrkMast.setWrkSts(14L);//14.宸插嚭搴撴湭纭
- } else if (wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) {
+ } else if ((wrkMast.getIoType() == 101 || wrkMast.getIoType() == 110) && statusParam.getTaskStatus() != 8) {
wrkMast.setWrkSts(7L);//7.鍑哄簱瀹屾垚
+ } else if (wrkMast.getWrkSts() == 7 && statusParam.getTaskStatus() == 8){
+ wrkMast.setWrkSts(15L);//15.鍑哄簱鏇存柊瀹屾垚锛屼换鍔＄粨鏉�
}
}
wrkMastService.updateById(wrkMast);
@@ -446,16 +485,41 @@
List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>());
List<HashMap<String, Object>> mapList = new ArrayList<>();
for (LocMast locMast : locMasts) {
- if (locMast.getLev1() != 4) {
+ if (locMast.getLocSts() != "X" && locMast.getLocSts() != "G" ) {
HashMap<String, Object> map = new HashMap<>();
map.put("warehouse", "ddth");
map.put("posiX", locMast.getRow1());
map.put("posiY", locMast.getBay1());
map.put("posiZ", locMast.getLev1());
map.put("cargoNo", locMast.getLocNo());
- map.put("type", "0");
+ if(locMast.getLev1() == 1 && locMast.getRow1() == 8 && locMast.getBay1() == 1){
+ map.put("type", "6");
+ }else {
+ map.put("type", "0");
+ }
mapList.add(map);
}
+ if(locMast.getLocSts() == "G"){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("warehouse", "ddth");
+ map.put("posiX", locMast.getRow1());
+ map.put("posiY", locMast.getBay1());
+ map.put("posiZ", locMast.getLev1());
+ map.put("cargoNo", locMast.getLocNo());
+ map.put("type", "1");
+ mapList.add(map);
+ }
+ if(locMast.getLocSts() == "X"){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("warehouse", "ddth");
+ map.put("posiX", locMast.getRow1());
+ map.put("posiY", locMast.getBay1());
+ map.put("posiZ", locMast.getLev1());
+ map.put("cargoNo", locMast.getLocNo());
+ map.put("type", "5");
+ mapList.add(map);
+ }
+
}
if (mapList.size() > 0) {
String response = "";
diff --git a/src/main/java/com/zy/common/web/param/SearchEmptyParam.java b/src/main/java/com/zy/common/web/param/SearchEmptyParam.java
new file mode 100644
index 0000000..2f5534f
--- /dev/null
+++ b/src/main/java/com/zy/common/web/param/SearchEmptyParam.java
@@ -0,0 +1,37 @@
+package com.zy.common.web.param;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class SearchEmptyParam {
+ /**
+ * 鐢宠鏃堕棿
+ */
+ @JsonProperty(value = "applyTime")
+ private String applyTime;
+
+ /**
+ * 浠撳簱缂栫爜
+ */
+ @JsonProperty(value = "warehouse")
+ private String warehouse;
+
+ /**
+ * 鍏ュ簱鍙ｇ紪鍙�
+ */
+ @JsonProperty(value = "fromPort")
+ private String fromPort;
+
+ /**
+ * 浠诲姟绫诲瀷
+ */
+ @JsonProperty(value = "taskType")
+ private Integer taskType;
+
+ /**
+ * 绌烘墭鐩樻暟閲�
+ */
+ @JsonProperty(value = "palletNum")
+ private Integer palletNum;
+}
diff --git a/src/main/java/com/zy/common/web/param/SearchLocParam.java b/src/main/java/com/zy/common/web/param/SearchLocParam.java
index 62dd3f0..4a1fbdb 100644
--- a/src/main/java/com/zy/common/web/param/SearchLocParam.java
+++ b/src/main/java/com/zy/common/web/param/SearchLocParam.java
@@ -18,6 +18,12 @@
private String applyTime;
/**
+ * 浠撳簱缂栫爜
+ */
+ @JsonProperty(value = "warehouse")
+ private String warehouse;
+
+ /**
* 鍏ュ簱鍙ｇ紪鍙�
*/
@JsonProperty(value = "fromPort")
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 0fff78f..eb4c21e 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/webapp/static/layuiadmin/json/content/list.js b/src/main/webapp/static/layuiadmin/json/content/list.js
index b70f3e7..91e946c 100644
--- a/src/main/webapp/static/layuiadmin/json/content/list.js
+++ b/src/main/webapp/static/layuiadmin/json/content/list.js
@@ -1,62 +1,62 @@
-{
- "code": 0
- ,"msg": ""
- ,"count": "100"
- ,"data": [{
- "id": "001"
- ,"label": "缇庨"
- ,"title": "鑸屽皷涓婄殑涓浗绗竴瀛�"
- ,"author": "浣滆��-1"
- ,"content": "閫氳繃涓崕缇庨鐨勫涓晶闈紝鏉ュ睍鐜伴鐗╃粰涓浗浜虹敓娲诲甫鏉ョ殑浠紡銆佷鸡鐞嗙瓑鏂归潰鐨勬枃鍖栵紱瑙佽瘑涓浗鐗硅壊椋熸潗浠ュ強涓庨鐗╃浉鍏炽�佹瀯鎴愪腑鍥界編椋熺壒鏈夋皵璐ㄧ殑涓�绯诲垪鍏冪礌锛涗簡瑙ｄ腑鍗庨ギ椋熸枃鍖栫殑绮捐嚧鍜屾簮杩滄祦闀�"
- ,"uploadtime": 20121204
- ,"status": true
- },{
- "id": "002"
- ,"label": "缇庨"
- ,"title": "鑸屽皷涓婄殑涓浗绗簩瀛�"
- ,"author": "浣滆��-2"
- ,"content": "浠ラ鐗╀负绐楀彛锛岃鎳備腑鍥解�斺�旈�氳繃缇庨锛屼娇浜轰滑鍙互鏈夋粙鏈夊懗鍦拌鐭ヨ繖涓彜鑰佺殑涓滄柟鍥藉害銆傗�滀竴鏂规按鍦熶竴鏂逛汉鈥濓紝鏈墖灏嗛�氳繃灞曠ず浜轰滑鏃ュ父鐢熸椿涓笌缇庨鐩稿叧鐨勫閲嶄晶闈紝鎻忕粯涓庢劅鐭ヤ腑鍥戒汉鐨勬枃鍖栦紶缁熴�佸鏃忚蹇点�佺敓娲绘�佸害涓庢晠鍦熼毦绂汇�備汉浠敹鑾枫�佷繚瀛樸�佺児楗�佺敓浜х編椋燂紝骞跺湪鍏惰繃绋嬩腑鐣欏瓨鍜屼紶鎵块鐗╂墍鎵胯浇鐨勫懗瑙夎蹇嗐�侀ギ椋熶範淇椼�佹枃鍖栨牱鎬佷笌瀹跺父鎯呮劅銆�"
- ,"uploadtime": 20141204
- ,"status": false
- },{
- "id": "003"
- ,"label": "缇庨"
- ,"title": "鑸屽皷涓婄殑涓浗绗笁瀛�"
- ,"author": "浣滆��-3"
- ,"content": "浠ラ鐗╀负绐楀彛锛岃鎳備腑鍥解�斺�旈�氳繃缇庨锛屼娇浜轰滑鍙互鏈夋粙鏈夊懗鍦拌鐭ヨ繖涓彜鑰佺殑涓滄柟鍥藉害銆傗�滀竴鏂规按鍦熶竴鏂逛汉鈥濓紝鏈墖灏嗛�氳繃灞曠ず浜轰滑鏃ュ父鐢熸椿涓笌缇庨鐩稿叧鐨勫閲嶄晶闈紝鎻忕粯涓庢劅鐭ヤ腑鍥戒汉鐨勬枃鍖栦紶缁熴�佸鏃忚蹇点�佺敓娲绘�佸害涓庢晠鍦熼毦绂汇�備汉浠敹鑾枫�佷繚瀛樸�佺児楗�佺敓浜х編椋燂紝骞跺湪鍏惰繃绋嬩腑鐣欏瓨鍜屼紶鎵块鐗╂墍鎵胯浇鐨勫懗瑙夎蹇嗐�侀ギ椋熶範淇椼�佹枃鍖栨牱鎬佷笌瀹跺父鎯呮劅灏嗕笘鐣岀編椋熷拰涓浗缇庨杩涜姣旂収銆傛槬鑰曘�佸鑰樸�佺鏀躲�佸啲钘忥紝澶╀汉鍚堜竴鐨勪笢鏂瑰摬瀛﹁涓浗楗渚濇椂鑰屽彉锛屾櫤鎱х伒鍔紝涓尰钀ュ吇鎽勭敓瀛﹁鍒涢�犱簡椋熸潗杩愮敤鐨勬柊澶╁湴锛屽剴瀹朵汉浼﹂亾寰峰垯鎶婂績鎰忓拰瀹剁殑鍛抽亾绔笂鎴戜滑鐨勯妗屻�傛窐娲楀巻鍙诧紝绯呭悎鏃跺厜锛屼竴浠ｅ張涓�浠ｇ殑涓浗浜哄湪澶╁湴闂村崌璧风儫鐏紝鐢ㄨ嚦绮捐嚦璇氱殑蹇冩剰鐑瑰埗椋熺墿锛屼竴椁愪竴椋熶箣闂达紝涓浗浜哄睍绀轰釜鎬э紝纭褰掑睘锛屾瀯寤烘枃鏄庯紝鐞嗚В鍜屾妸鎻＄潃涓栫晫鐨勫ゥ濡欍��"
- ,"uploadtime": 20161204
- ,"status": false
- },{
- "id": "004"
- ,"label": "鍘嗗彶"
- ,"title": "璇歌憶浜獋鐜嬫湕"
- ,"author": "浣滆��-1"
- ,"content": "鐨撻鍖瑰か锛佽媿楂�佽醇锛佷綘鍗冲皢鍛藉綊浜庝節娉変箣涓嬶紝灞婃椂锛屾湁浣曢潰鐩姹夋湞浜屽崄鍥涗唬鍏堝笣锛熶簩鑷ｈ醇瀛愶紒浣犳瀴娲讳竷鍗佹湁鍏紝涓�鐢熸湭绔嬪鍔燂紝鍙細鎽囧攪鑸炶垖锛屽姪鏇逛负铏愶紒涓�鏉℃柇鑴婁箣鐘紝杩樻暍鍦ㄦ垜鍐涢樀鍓嶇嫼鐙虹媯鍚狅紒鎴戜粠鏈杩囧姝ゅ帤棰滄棤鑰讳箣浜猴紒锛侊紒"
- ,"uploadtime": 20180201
- ,"status": false
- },{
- "id": "005"
- ,"label": "鏂伴椈"
- ,"title": "鏂版椂浠ｇ壒鑹蹭腑鍥芥ⅵ"
- ,"author": "浣滆��-1"
- ,"content": "浠婂ぉ锛屾垜浠瘮鍘嗗彶涓婁换浣曟椂鏈熼兘鏇存帴杩戙�佹洿鏈変俊蹇冨拰鑳藉姏瀹炵幇涓崕姘戞棌浼熷ぇ澶嶅叴鐨勭洰鏍囥�傛柊鏃朵唬宸茬粡鍒版潵锛岃摑鍥惧凡缁忕粯灏憋紝涓浗姊︾鎴戜滑瓒婃潵瓒婅繎浜嗐��"
- ,"uploadtime": 20180512
- ,"status": false
- },{
- "id": "006"
- ,"label": "鏂伴椈"
- ,"title": "鏂版椂浠ｇ壒鑹蹭腑鍥芥ⅵ"
- ,"author": "浣滆��-2"
- ,"content": "姊︽兂涓嶄細涓诲姩璧板悜鎴戜滑锛屽彧鏈夋垜浠幓涓诲姩瀹炵幇姊︽兂銆傝鐧鹃噷鑰呭崐涔濆崄銆傝櫧鐒朵腑鍥芥ⅵ绂绘垜浠秺鏉ヨ秺杩戜簡锛屼絾鏄瀹炵幇涓浗姊︼紝杩樿闈犳垜浠互姘镐笉鎳堟�犵殑绮剧鐘舵�併�佸姛鍦ㄤ笉鑸嶇殑鍧氬己鎰忓織锛屼笉蹇樺垵蹇冿紝缁х画鍓嶈繘銆�"
- ,"uploadtime": 20180514
- ,"status": false
- },{
- "id": "007"
- ,"label": "浣撹偛"
- ,"title": "鐨囬┈澶ф垬鍒╃墿娴�"
- ,"author": "浣滆��-3"
- ,"content": "瀵规瓒宠仈鑰岃█锛屾洿鎯宠浜х敓涓柊鍐犲啗銆傝繛缁笁骞撮兘鏄悓涓�涓啝鍐涢槦锛岃繖浼氭瘉鎺夋鍐犫�︹�︹�濇牸閲屽琛ㄦ�侊紝鈥滅殗椹湁姊﹀够鑸殑闃靛锛屼絾浠庝績杩涚珵浜夌殑瑙掑害鑰岃█锛屽彟涓�鏀悆闃熻幏鑳滀細鏇村ソ銆�"
- ,"uploadtime": 20180515
- ,"status": false
- }]
-}
\ No newline at end of file
+// {
+// "code": 0
+// ,"msg": ""
+// ,"count": "100"
+// ,"data": [{
+// "id": "001"
+// ,"label": "缇庨"
+// ,"title": "鑸屽皷涓婄殑涓浗绗竴瀛�"
+// ,"author": "浣滆��-1"
+// ,"content": "閫氳繃涓崕缇庨鐨勫涓晶闈紝鏉ュ睍鐜伴鐗╃粰涓浗浜虹敓娲诲甫鏉ョ殑浠紡銆佷鸡鐞嗙瓑鏂归潰鐨勬枃鍖栵紱瑙佽瘑涓浗鐗硅壊椋熸潗浠ュ強涓庨鐗╃浉鍏炽�佹瀯鎴愪腑鍥界編椋熺壒鏈夋皵璐ㄧ殑涓�绯诲垪鍏冪礌锛涗簡瑙ｄ腑鍗庨ギ椋熸枃鍖栫殑绮捐嚧鍜屾簮杩滄祦闀�"
+// ,"uploadtime": 20121204
+// ,"status": true
+// },{
+// "id": "002"
+// ,"label": "缇庨"
+// ,"title": "鑸屽皷涓婄殑涓浗绗簩瀛�"
+// ,"author": "浣滆��-2"
+// ,"content": "浠ラ鐗╀负绐楀彛锛岃鎳備腑鍥解�斺�旈�氳繃缇庨锛屼娇浜轰滑鍙互鏈夋粙鏈夊懗鍦拌鐭ヨ繖涓彜鑰佺殑涓滄柟鍥藉害銆傗�滀竴鏂规按鍦熶竴鏂逛汉鈥濓紝鏈墖灏嗛�氳繃灞曠ず浜轰滑鏃ュ父鐢熸椿涓笌缇庨鐩稿叧鐨勫閲嶄晶闈紝鎻忕粯涓庢劅鐭ヤ腑鍥戒汉鐨勬枃鍖栦紶缁熴�佸鏃忚蹇点�佺敓娲绘�佸害涓庢晠鍦熼毦绂汇�備汉浠敹鑾枫�佷繚瀛樸�佺児楗�佺敓浜х編椋燂紝骞跺湪鍏惰繃绋嬩腑鐣欏瓨鍜屼紶鎵块鐗╂墍鎵胯浇鐨勫懗瑙夎蹇嗐�侀ギ椋熶範淇椼�佹枃鍖栨牱鎬佷笌瀹跺父鎯呮劅銆�"
+// ,"uploadtime": 20141204
+// ,"status": false
+// },{
+// "id": "003"
+// ,"label": "缇庨"
+// ,"title": "鑸屽皷涓婄殑涓浗绗笁瀛�"
+// ,"author": "浣滆��-3"
+// ,"content": "浠ラ鐗╀负绐楀彛锛岃鎳備腑鍥解�斺�旈�氳繃缇庨锛屼娇浜轰滑鍙互鏈夋粙鏈夊懗鍦拌鐭ヨ繖涓彜鑰佺殑涓滄柟鍥藉害銆傗�滀竴鏂规按鍦熶竴鏂逛汉鈥濓紝鏈墖灏嗛�氳繃灞曠ず浜轰滑鏃ュ父鐢熸椿涓笌缇庨鐩稿叧鐨勫閲嶄晶闈紝鎻忕粯涓庢劅鐭ヤ腑鍥戒汉鐨勬枃鍖栦紶缁熴�佸鏃忚蹇点�佺敓娲绘�佸害涓庢晠鍦熼毦绂汇�備汉浠敹鑾枫�佷繚瀛樸�佺児楗�佺敓浜х編椋燂紝骞跺湪鍏惰繃绋嬩腑鐣欏瓨鍜屼紶鎵块鐗╂墍鎵胯浇鐨勫懗瑙夎蹇嗐�侀ギ椋熶範淇椼�佹枃鍖栨牱鎬佷笌瀹跺父鎯呮劅灏嗕笘鐣岀編椋熷拰涓浗缇庨杩涜姣旂収銆傛槬鑰曘�佸鑰樸�佺鏀躲�佸啲钘忥紝澶╀汉鍚堜竴鐨勪笢鏂瑰摬瀛﹁涓浗楗渚濇椂鑰屽彉锛屾櫤鎱х伒鍔紝涓尰钀ュ吇鎽勭敓瀛﹁鍒涢�犱簡椋熸潗杩愮敤鐨勬柊澶╁湴锛屽剴瀹朵汉浼﹂亾寰峰垯鎶婂績鎰忓拰瀹剁殑鍛抽亾绔笂鎴戜滑鐨勯妗屻�傛窐娲楀巻鍙诧紝绯呭悎鏃跺厜锛屼竴浠ｅ張涓�浠ｇ殑涓浗浜哄湪澶╁湴闂村崌璧风儫鐏紝鐢ㄨ嚦绮捐嚦璇氱殑蹇冩剰鐑瑰埗椋熺墿锛屼竴椁愪竴椋熶箣闂达紝涓浗浜哄睍绀轰釜鎬э紝纭褰掑睘锛屾瀯寤烘枃鏄庯紝鐞嗚В鍜屾妸鎻＄潃涓栫晫鐨勫ゥ濡欍��"
+// ,"uploadtime": 20161204
+// ,"status": false
+// },{
+// "id": "004"
+// ,"label": "鍘嗗彶"
+// ,"title": "璇歌憶浜獋鐜嬫湕"
+// ,"author": "浣滆��-1"
+// ,"content": "鐨撻鍖瑰か锛佽媿楂�佽醇锛佷綘鍗冲皢鍛藉綊浜庝節娉変箣涓嬶紝灞婃椂锛屾湁浣曢潰鐩姹夋湞浜屽崄鍥涗唬鍏堝笣锛熶簩鑷ｈ醇瀛愶紒浣犳瀴娲讳竷鍗佹湁鍏紝涓�鐢熸湭绔嬪鍔燂紝鍙細鎽囧攪鑸炶垖锛屽姪鏇逛负铏愶紒涓�鏉℃柇鑴婁箣鐘紝杩樻暍鍦ㄦ垜鍐涢樀鍓嶇嫼鐙虹媯鍚狅紒鎴戜粠鏈杩囧姝ゅ帤棰滄棤鑰讳箣浜猴紒锛侊紒"
+// ,"uploadtime": 20180201
+// ,"status": false
+// },{
+// "id": "005"
+// ,"label": "鏂伴椈"
+// ,"title": "鏂版椂浠ｇ壒鑹蹭腑鍥芥ⅵ"
+// ,"author": "浣滆��-1"
+// ,"content": "浠婂ぉ锛屾垜浠瘮鍘嗗彶涓婁换浣曟椂鏈熼兘鏇存帴杩戙�佹洿鏈変俊蹇冨拰鑳藉姏瀹炵幇涓崕姘戞棌浼熷ぇ澶嶅叴鐨勭洰鏍囥�傛柊鏃朵唬宸茬粡鍒版潵锛岃摑鍥惧凡缁忕粯灏憋紝涓浗姊︾鎴戜滑瓒婃潵瓒婅繎浜嗐��"
+// ,"uploadtime": 20180512
+// ,"status": false
+// },{
+// "id": "006"
+// ,"label": "鏂伴椈"
+// ,"title": "鏂版椂浠ｇ壒鑹蹭腑鍥芥ⅵ"
+// ,"author": "浣滆��-2"
+// ,"content": "姊︽兂涓嶄細涓诲姩璧板悜鎴戜滑锛屽彧鏈夋垜浠幓涓诲姩瀹炵幇姊︽兂銆傝鐧鹃噷鑰呭崐涔濆崄銆傝櫧鐒朵腑鍥芥ⅵ绂绘垜浠秺鏉ヨ秺杩戜簡锛屼絾鏄瀹炵幇涓浗姊︼紝杩樿闈犳垜浠互姘镐笉鎳堟�犵殑绮剧鐘舵�併�佸姛鍦ㄤ笉鑸嶇殑鍧氬己鎰忓織锛屼笉蹇樺垵蹇冿紝缁х画鍓嶈繘銆�"
+// ,"uploadtime": 20180514
+// ,"status": false
+// },{
+// "id": "007"
+// ,"label": "浣撹偛"
+// ,"title": "鐨囬┈澶ф垬鍒╃墿娴�"
+// ,"author": "浣滆��-3"
+// ,"content": "瀵规瓒宠仈鑰岃█锛屾洿鎯宠浜х敓涓柊鍐犲啗銆傝繛缁笁骞撮兘鏄悓涓�涓啝鍐涢槦锛岃繖浼氭瘉鎺夋鍐犫�︹�︹�濇牸閲屽琛ㄦ�侊紝鈥滅殗椹湁姊﹀够鑸殑闃靛锛屼絾浠庝績杩涚珵浜夌殑瑙掑害鑰岃█锛屽彟涓�鏀悆闃熻幏鑳滀細鏇村ソ銆�"
+// ,"uploadtime": 20180515
+// ,"status": false
+// }]
+// }
\ No newline at end of file
--
Gitblit v1.9.1