From 164a53adaed58ad0519bc214b08c0bfb287723f4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 14:40:45 +0800
Subject: [PATCH] 数据导入提交2
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java | 18 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java | 26 +++
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml | 134 ++++++++--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java | 285 ++++++++++++++--------------------
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java | 12 +
5 files changed, 242 insertions(+), 233 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
index 8c885e6..094b219 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/DepotService.java
@@ -269,4 +269,30 @@
}
return depot;
}
+
+ /**
+ * 鑾峰彇浠撳簱淇℃伅-鏍规嵁浠撳簱鍚嶇О鑾峰彇浠撳簱ID
+ *
+ * @param deptId
+ * @return
+ */
+ public String getDepotId(String deptId, String depotName) {
+ if (StringUtils.isEmpty(deptId)) {
+ return null;
+ }
+ if (StringUtils.isEmpty(depotName)) {
+ return null;
+ }
+
+ List<Depot> depotList = getCacheDepotList(ContextUtil.getCompanyId(), deptId);
+ if(null == depotList || depotList.isEmpty()){
+ return null;
+ }
+ for (Depot depot : depotList) {
+ if(depotName.equals(depot.getName())){
+ return depot.getId();
+ }
+ }
+ return null;
+ }
}
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
index 05887ef..b2a4ed9 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/ExportService.java
@@ -214,6 +214,18 @@
}
}
+ //閫氱煡鍗曠紪鐮�
+ cell = row.getCell(cellNum++);
+ if(cell == null || cell.getCellType() == CellType.BLANK){
+ resultData.setNoticeId("");
+ }else {
+ cell.setCellType(CellType.STRING);
+ String noticeId = cell.getStringCellValue().trim();
+ if(StringUtils.isNotEmpty(noticeId)){
+ resultData.setNoticeId(noticeId);
+ }
+ }
+
//瑁呭嵏浠撳簱
cell = row.getCell(cellNum++);
if(cell == null || cell.getCellType() == CellType.BLANK){
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index 159b5c2..7b8097e 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -257,6 +257,24 @@
/**
* 鏂板鍑哄叆搴撹褰�
*
+ * @param list
+ * @return
+ */
+ public String addInoutRecordList(List<InoutRecord> list) {
+ if(null == list || list.isEmpty()){
+ return "鏂板澶辫触";
+ }
+
+ for (InoutRecord inoutRecord : list) {
+ addInoutRecord(inoutRecord);
+ }
+
+ return null;
+ }
+
+ /**
+ * 鏂板鍑哄叆搴撹褰�
+ *
* @param data
* @return
*/
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
index 90d2b62..ed11698 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutDataPR.java
@@ -5,13 +5,20 @@
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
import com.fzzy.igds.constant.Constant;
+import com.fzzy.igds.data.BaseResp;
import com.fzzy.igds.data.InoutData;
import com.fzzy.igds.data.InoutParam;
+import com.fzzy.igds.domain.InoutNoticeIn;
+import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.domain.InoutRecord;
+import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.ExportService;
+import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.service.InoutRecordService;
import com.fzzy.igds.utils.ContextUtil;
import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +37,10 @@
private InoutRecordService inoutRecordService;
@Resource
private ExportService exportService;
+ @Resource
+ private InoutNoticeService noticeService;
+ @Resource
+ private DepotService depotService;
/**
* inoutDataPR#pageInoutData
@@ -169,173 +180,115 @@
* @return
*/
@Expose
- public String analysisExcel(String fileName) {
- return "瀵煎叆鍔熻兘寰呬笂绾匡紒锛�";
-// try {
-// List<InoutRecord> inoutRecords = exportService.readExcel(fileName);
-// if (null == inoutRecords || inoutRecords.isEmpty()) {
-// return "瀵煎叆澶辫触锛屽師鍥�-->鏈幏鍙栧埌excel涓枃妗ｆ暟鎹紒";
-// }
-//
-//
-// for (InoutRecord inoutRecord : inoutRecords) {
-//
-// //TODO 鍒ゆ柇鏁版嵁鏄惁姝ｅ父鏁版嵁锛屾甯稿垯鏂板锛屽紓甯稿垯蹇界暐
-// //璁剧疆鏁版嵁鐘舵�佸強娴佺▼
-// inoutRecord.setRecordStatus(Constant.RECORD_STATUS_ADD);
-// inoutRecord.setProgress(Constant.PROGRESS_RECORD);
-//
-// inoutRecord.setCompleteTime(new Date());
-//
-//
-// inoutRecord.setRegisterTime(DateUtils.addHours(new Date(), -2));
-//
-//
-//
-//
-// inoutRecordService.addInoutRecord(inoutRecord);
-// }
-//
-//
-//
-//
-// return null;
-// } catch (Exception e) {
-// return "瀵煎叆澶辫触锛屽師鍥�-->" + e.getMessage();
-// }
+ public BaseResp analysisExcel(String fileName) {
+ try {
+ List<InoutRecord> inoutRecords = exportService.readExcel(fileName);
+ if (null == inoutRecords || inoutRecords.isEmpty()) {
+ return BaseResp.error("瀵煎叆澶辫触锛屽師鍥�-->鏈幏鍙栧埌excel涓枃妗ｆ暟鎹紒");
+ }
-// // 璇诲彇鐨凟xcel鏂囦欢鏁版嵁
-// List<NoticeInData> readResult = readExcel(fileName);
-// if (null == readResult) {
-// return new PageResponse<String>(RespCodeEnum.CODE_1111.getCode(),
-// "瀵煎叆澶辫触锛氭病鏈夎В鏋愬埌鏂囦欢涓暟鎹紒");
-// }
-//
-// // 鏌ヨ鍒扮殑鎵�鏈変緵搴斿晢淇℃伅
-// InoutParam param = new InoutParam();
-// param.setTagSupplier(Constant.TR_TRUE + "");
-// List<InoutCustomer> allCustomer = inoutCommonService.listCustomer(param);
-//
-// //鏂板缓浠诲姟瀛樻斁闆嗗悎
-// List<NoticeInData> newCustomerTaskList = new ArrayList<>();
-// Map<String, NoticeInData> newMap = new HashMap<>();
-//
-// //瀛樻斁缂栫爜鍜屽悕绉颁笉涓�鑷寸殑淇℃伅
-// StringBuilder stringBuilder = new StringBuilder();
-//
-// //鐢╰empFlag鍦ㄥ悗闈㈡潵鍒ゆ柇瑙ｆ瀽鍒扮殑瀹㈡埛鏄惁鍦ㄥ鎴疯〃涓瓨鍦�
-// boolean tempFlag;
-//
-// int max = 0;
-// for (NoticeInData noticeInData : readResult) {
-// //鑾峰彇瀹㈡埛浠诲姟鏁版嵁涓殑瀹㈡埛鍚嶇О鍜岀紪鐮�
-// String customerName = noticeInData.getCustomerName();
-// String customerId = noticeInData.getCustomerId();
-// //鍒ゆ柇缂栫爜鏄惁涓虹┖,涓虹┖鍒欑粰鍑烘彁绀�,涓嶈繘琛屾搷浣�
-// if(StringUtils.isEmpty(customerName)){
-// stringBuilder.append("瀹㈡埛鈥�").append(customerName).append("鈥欎俊鎭笉瀹屾暣锛屼笉瀵煎叆姝ゆ潯鏁版嵁锛沑n");
-// continue;
-// }
-//
-// tempFlag = true;
-//
-// for (InoutCustomer customer : allCustomer) {
-// //鑾峰彇渚涘簲鍟嗗悕绉板拰缂栫爜
-// String name = customer.getName();
-// String id = customer.getId();
-// //鍒ゆ柇鍚嶇О鏄惁鐩稿悓
-// if(customerName.equals(name)){
-// //鍚嶇О鐩稿悓锛屽垯瀹㈡埛鍦ㄨ〃涓瓨鍦�
-// tempFlag = false;
-// //鍒ゆ柇缂栫爜鏄惁鐩稿悓
-// if(StringUtils.isEmpty(customerId) || !id.equals(customerId)){
-//
-// noticeInData.setCustomerId(id);
-// }
-// noticeInData.setCompanyId(customer.getCompanyId());
-// //韬唤璇佸彿
-// if(StringUtils.isEmpty(noticeInData.getCardId())){
-// noticeInData.setCardId(customer.getCardId());
-// }
-// //鍦板潃
-// if(StringUtils.isEmpty(noticeInData.getAddress())){
-// noticeInData.setAddress(customer.getAddress());
-// }
-// //鐢佃瘽
-// if(StringUtils.isEmpty(noticeInData.getPhone())){
-// noticeInData.setPhone(customer.getPhone());
-// }
-// //涓�鍗￠�氬彿
-// if(StringUtils.isEmpty(noticeInData.getBankNum())){
-// noticeInData.setBankNum(customer.getBankNum());
-// }
-// }
-// }
-//
-// if(tempFlag){
-// if(max == 0){
-// max = Integer.parseInt(inoutCommonService.getMaxCustomerId(null));
-// }
-// max += 1;
-// noticeInData.setCustomerId(max + "");
-// }
-//
-// newCustomerTaskList.add(noticeInData);
-//
-// newMap.putIfAbsent(noticeInData.getCustomerName(), noticeInData);
-// }
-//
-// //鏇存柊瀹㈡埛淇℃伅琛�
-// if(newMap.size() > 0){
-// for (NoticeInData noticeInData : newMap.values()) {
-// int i = inoutCommonService.updateCustomer(noticeInData);
-// if (i == 0) {
-// //璇存槑娌℃湁鏇存柊鍒板鎴蜂俊鎭紝杩涜鏂板
-// InoutCustomer data = new InoutCustomer();
-// data.setId(noticeInData.getCustomerId());
-// data.setName(noticeInData.getCustomerName());
-// data.setCardId(noticeInData.getCardId());
-// data.setBankNum(noticeInData.getBankNum());
-// data.setAddress(noticeInData.getAddress());
-// data.setPhone(noticeInData.getPhone());
-// data.setTagSupplier(Constant.TR_TRUE + "");
-// customerService.saveOrUpdataData(data);
-// }
-// }
-// }
-//
-// //鍒ゆ柇浠诲姟闆嗗悎鏄惁涓虹┖
-// if (newCustomerTaskList.isEmpty()) {
-// return new PageResponse<String>(RespCodeEnum.CODE_1111.getCode(),
-// "瀵煎叆澶辫触锛乗n" + stringBuilder.toString());
-// } else {
-// //鏇存柊浠诲姟琛�
-// int temp = 1;
-// for (NoticeInData noticeInData : newCustomerTaskList) {
-// //璁剧疆瀹㈡埛閫氱煡鍗曠殑缁勭粐缂栫爜绛変俊鎭�
-// noticeInData.setCompanyId(ContextUtil.getCompanyId());
-// noticeInData.setDeptId(ContextUtil.subDeptId(null));
-// noticeInData.setCreateUser(ContextUtil.getLoginUserCName());
-// if(temp < 10){
-// noticeInData.setId(ContextUtil.getTimeId() + "00" + temp);
-// }else if(temp < 100){
-// noticeInData.setId(ContextUtil.getTimeId() + "0" + temp);
-// }else {
-// noticeInData.setId(ContextUtil.getTimeId() + temp);
-// }
-//
-// //鏇存柊瀹㈡埛浠诲姟淇℃伅,濡傛灉鏇存柊澶辫触,鍒欒繘琛屾彃鍏ユ搷浣�
-// inoutCommonService.updateNoticeIn(noticeInData);
-// temp += 1;
-// }
-// if(StringUtils.isEmpty(stringBuilder.toString())){
-// return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), "鏁版嵁鍏ㄩ儴瀵煎叆鎴愬姛锛�");
-// }else {
-// String message = "鏁版嵁閮ㄥ垎瀵煎叆鎴愬姛锛乗n"+ stringBuilder.toString();
-// return new PageResponse<String>(RespCodeEnum.CODE_0000.getCode(), message);
-// }
-//
-// }
+ //鍒ゆ柇鏁版嵁瀹屾暣鎬�
+ boolean addTag = false;
+ int hour = 10;
+ int min = 10;
+
+ for (InoutRecord inoutRecord : inoutRecords) {
+ //璁剧疆鏁版嵁鐘舵�佸強娴佺▼
+ inoutRecord.setRecordStatus(Constant.RECORD_STATUS_ADD);
+ inoutRecord.setProgress(Constant.PROGRESS_RECORD);
+
+ //鏍￠獙閫氱煡鍗�
+ String noticeId = inoutRecord.getNoticeId();
+ if(StringUtils.isBlank(noticeId)){
+ addTag = true;
+ break;
+ }
+ if(noticeId.startsWith("RK_")){
+ InoutNoticeIn noticeInOne = noticeService.getNoticeInOne(noticeId);
+ if(null == noticeInOne){
+ addTag = true;
+ break;
+ }
+ inoutRecord.setDeptId(noticeInOne.getDeptId());
+ }
+ if(noticeId.startsWith("CK_")){
+ InoutNoticeOut noticeOut = noticeService.getNoticeOutOne(noticeId);
+ if(null == noticeOut){
+ addTag = true;
+ break;
+ }
+ inoutRecord.setDeptId(noticeOut.getDeptId());
+ }
+
+ //鏍￠獙浠撳簱
+ String depotName = inoutRecord.getDepotId();
+ if(StringUtils.isBlank(depotName)){
+ addTag = true;
+ break;
+ }
+ //鏍规嵁浠撳簱鍚嶇О鑾峰彇浠撳簱缂栫爜
+ String depotId = depotService.getDepotId(inoutRecord.getDeptId(), depotName);
+ if(StringUtils.isBlank(depotId)){
+ addTag = true;
+ break;
+ }
+ inoutRecord.setDepotId(depotId);
+
+ //鏍￠獙鏃ユ湡鏄惁瀹屾暣
+ String plateNum = inoutRecord.getPlateNum();
+ if(null == plateNum){
+ addTag = true;
+ break;
+ }
+ inoutRecord.setPlateNum(plateNum);
+
+ //鏍￠獙鏃ユ湡鏄惁瀹屾暣
+ Date registerTime = inoutRecord.getRegisterTime();
+ if(null == registerTime){
+ addTag = true;
+ break;
+ }
+
+ //璁剧疆鐧昏銆佺О閲嶃�佸畬鎴愭椂闂�
+ String time = DateFormatUtils.format(registerTime, "yyyy-MM-dd");
+ if(min >= 60){
+ min = 10;
+ hour ++;
+ }
+ time += " " + hour + ":" + min + ":00";
+ inoutRecord.setRegisterTime(DateUtils.parseDate(time,"yyyy-MM-dd HH:mm:ss"));
+ if(Constant.TYPE_IN.equals(inoutRecord.getType())){
+ inoutRecord.setFullWeightTime(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 3));
+ inoutRecord.setHandleEnd(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 30));
+ inoutRecord.setEmptyWeightTime(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 50));
+ }
+ if(Constant.TYPE_OUT.equals(inoutRecord.getType())){
+ inoutRecord.setEmptyWeightTime(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 3));
+ inoutRecord.setHandleEnd(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 30));
+ inoutRecord.setFullWeightTime(DateUtils.addMinutes(inoutRecord.getRegisterTime(), 50));
+ }
+ inoutRecord.setCompleteTime(DateUtils.addHours(inoutRecord.getRegisterTime(), 1));
+
+ inoutRecord.setCompanyId(ContextUtil.getCompanyId());
+ min ++;
+ }
+
+ if(addTag){
+ return BaseResp.error("瀵煎叆澶辫触锛屽師鍥�-->鏁版嵁鏍￠獙澶辫触锛岃鏍告煡鏁版嵁<鏃ユ湡銆佺被鍨嬨�佽溅鐗屻�侀�氱煡鍗曘�佷粨搴撱�佸搧绉嶇瓑淇℃伅>锛侊紒锛�");
+ }
+
+ //鏂板鏁版嵁
+ String msg = inoutRecordService.addInoutRecordList(inoutRecords);
+
+ if(null == msg){
+ return BaseResp.success("瀵煎叆鎴愬姛锛屽叡璁″鍏�" + inoutRecords.size() + "鏉℃暟鎹紒" );
+ }else {
+ return BaseResp.error(msg);
+ }
+ } catch (Exception e) {
+ return BaseResp.error("瀵煎叆澶辫触锛屽師鍥�-->" + e.getMessage());
+ }
+
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
index eab40e7..d3e6642 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutList.view.xml
@@ -725,7 +725,7 @@
<Dialog id="dialogMain" layout="regionPadding:8">
<Property name="iconClass">fa fa-tasks</Property>
<Property name="caption">鍗曟嵁淇℃伅</Property>
- <Property name="width">70%</Property>
+ <Property name="width">80%</Property>
<Property name="closeable">false</Property>
<Property name="height">90%</Property>
<Buttons>
@@ -763,7 +763,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
@@ -777,7 +777,7 @@
<Property name="property">plateNum</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<Property name="name">deptId</Property>
<Property name="property">deptId</Property>
<Property name="readOnly">true</Property>
@@ -787,6 +787,11 @@
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Property name="label">瑁呭嵏浠撳簱</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">foodVariety</Property>
+ <Property name="property">foodVariety</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -800,29 +805,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perWet</Property>
- <Property name="property">perWet</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userContact</Property>
- <Property name="property">userContact</Property>
- <Property name="label">鑱旂郴鐢佃瘽</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">perImpurity</Property>
- <Property name="property">perImpurity</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -838,6 +822,12 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">userContact</Property>
+ <Property name="property">userContact</Property>
+ <Property name="label">鑱旂郴鐢佃瘽</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="label">瀹㈡埛鍚嶇О</Property>
<Property name="property">customerName</Property>
<Property name="editable">false</Property>
@@ -849,6 +839,16 @@
<Property name="property">noticeId</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perWet</Property>
+ <Property name="property">perWet</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">perImpurity</Property>
+ <Property name="property">perImpurity</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
@@ -858,76 +858,76 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,50,*,50,*,50</Property>
+ <Property name="cols">*,*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">fullWeight</Property>
- <Property name="property">fullWeight</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">fullWeightTime</Property>
<Property name="property">fullWeightTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">fullWeightUser</Property>
<Property name="property">fullWeightUser</Property>
<Property name="label">婊¤溅绉伴噸浜�</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">emptyWeight</Property>
- <Property name="property">emptyWeight</Property>
+ <Property name="name">fullWeight</Property>
+ <Property name="property">fullWeight</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightUser</Property>
- <Property name="property">emptyWeightUser</Property>
- <Property name="label">绌鸿溅绉伴噸浜�</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
<Property name="name">deOther</Property>
<Property name="property">deOther</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">emptyWeightTime</Property>
+ <Property name="property">emptyWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">emptyWeightUser</Property>
+ <Property name="property">emptyWeightUser</Property>
+ <Property name="label">绌鸿溅绉伴噸浜�</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
+ <Property name="name">emptyWeight</Property>
+ <Property name="property">emptyWeight</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">registerTime</Property>
<Property name="property">registerTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">settleWeight</Property>
<Property name="property">settleWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">recordWeight</Property>
<Property name="property">recordWeight</Property>
<Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -1188,12 +1188,12 @@
if(fileName){
$notify("闄勪欢涓婁紶鎴愬姛锛屽紑濮嬫墽琛岃В鏋愨�︹��");
view.get("#ajaxAnalysisExcel").set("parameter",fileName).execute(function(result){
- if(result){
- $alert(result);
- }else{
- $alert("瀵煎叆骞惰В鏋愭垚鍔燂紒");
+ if("200"!=result.code){
+ $alert(result.message);
+ }else{
+ $alert(result.message);
query();
- }
+ }
});
}</ClientEvent>
<Property name="fileResolver">fileUploadManage#uploadExcel</Property>
--
Gitblit v1.9.3