From 6f45f4a29ce38525f3f9e3931bcedfc77bde765e Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 24 六月 2023 18:07:43 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 458 +++------
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 19
igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java | 2
igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java | 1
igds-inout/src/main/java/models/inout.model.xml | 127 +-
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 178 ---
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java | 4
igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java | 7
igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java | 1
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java | 3
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 24
igds-core/src/main/java/com/ld/igds/common/CoreCommonService.java | 9
igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java | 3
igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java | 13
igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java | 52 -
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 7
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js | 107 --
igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java | 5
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 29
/dev/null | 1502 --------------------------------
igds-inout/src/main/java/com/ld/igds/m/service/JInoutCheckService.java | 1
igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java | 1
igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java | 2
igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 2
igds-doc/sql/update-v35-to-v40.sql | 3
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 121 +-
igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java | 3
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 18
28 files changed, 370 insertions(+), 2,332 deletions(-)
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
index 79a37a4..b8f8227 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1302.java
@@ -117,8 +117,7 @@
dto.setRkdnm(StringUtils.isEmpty(inoutRecord.getNoticeId())?"0":inoutRecord.getNoticeId());
dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
- InoutConstant.RECORD_STATUS_ERROR.equals(inoutRecord.getRecordStatus())){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus())){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍏ュ簱瀹屾垚
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
index 1e94b25..c8faf7e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1306.java
@@ -116,8 +116,7 @@
dto.setZznm(inoutRecord.getDepotId().substring(0, 21));
dto.setDjbh(inoutRecord.getId());
dto.setSxh(inoutRecord.getId().substring(10));
- if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ||
- InoutConstant.RECORD_STATUS_ERROR.equals(inoutRecord.getRecordStatus())){
+ if(InoutConstant.RECORD_STATUS_DEL.equals(inoutRecord.getRecordStatus()) ){
dto.setDjzt("4"); //宸蹭綔搴�
}else {
dto.setDjzt("2"); //鍑哄簱瀹屾垚
diff --git a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
index 6522c87..437a53e 100644
--- a/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
+++ b/igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java
@@ -289,7 +289,6 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
if(StringUtils.isNotEmpty(depotId)){
hql += " and depotId =:depotId";
@@ -805,7 +804,6 @@
args.put("companyId", companyId);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
if(null != startTime){
hql += " and registerTime >:startTime";
diff --git a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
index 3148d51..20b9554 100644
--- a/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
+++ b/igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java
@@ -97,7 +97,6 @@
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", param.getCompanyId());
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
if (StringUtils.isNotEmpty(param.getDeptId())) {
hql += " and deptId =:deptId";
@@ -147,8 +146,7 @@
Map<String, Object> args = new HashMap<String, Object>();
args.put("recordStatus1", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatus2", InoutConstant.RECORD_STATUS_ERROR);
-
+
if (StringUtils.isNotEmpty(companyId)) {
hql += " and companyId =:companyId";
args.put("companyId", companyId);
diff --git a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
index 5184293..df9bc38 100644
--- a/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
+++ b/igds-basic/src/main/java/com/ld/igds/basic/controller/CommonController.java
@@ -9,7 +9,6 @@
import com.ld.igds.data.Page;
import com.ld.igds.data.PageResponse;
import com.ld.igds.grain.dto.GrainData;
-import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.models.Depot;
import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSysConf;
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
index f72423d..7554af0 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
@@ -18,71 +18,76 @@
@Component(CheckStandardManager.BEAN_ID)
public class CheckStandardManager {
- public static final String BEAN_ID = "check.checkStandardManager";
+ public static final String BEAN_ID = "check.checkStandardManager";
- @Autowired
- private CoreCheckStandardService checkStandardService;
+ @Autowired
+ private CoreCheckStandardService checkStandardService;
+ /**
+ * 鏍规嵁鍙傛暟鑾峰彇鍖栭獙椤瑰垪琛�
+ *
+ * @param checkId
+ * @param companyId
+ * @param foodVariety
+ * @return
+ */
+ public List<CheckItemData> listCheckItem(String companyId, String checkId,
+ String foodVariety) {
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- /**
- * 鏍规嵁鍙傛暟鑾峰彇鍖栭獙椤瑰垪琛�
- *
- * @param checkId
- * @param companyId
- * @param foodVariety
- * @return
- */
- public List<CheckItemData> listCheckItem(String checkId, String companyId, String foodVariety) {
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
- }
+ List<CheckItemData> list = null;
+ if (null != checkId)
+ list = checkStandardService.getCheckItemById(checkId, companyId);
- List<CheckItemData> list = checkStandardService.getCheckItemById(checkId, companyId);
+ if (list == null || list.isEmpty()) {
+ list = checkStandardService.getCheckItemByStandard(companyId,checkId, foodVariety);
+ }
+
+ return list;
+ }
- if (list == null || list.isEmpty()) {
- list = checkStandardService.getCheckItemByStandard(checkId, companyId, foodVariety);
- }
- return list;
- }
+ public CheckUpdateResult updateCheckItems(String checkId, String companyId,
+ List<CheckItemData> checkItems) {
- public CheckUpdateResult updateCheckItems(String checkId, String companyId, List<CheckItemData> checkItems) {
+ CheckUpdateResult result = new CheckUpdateResult();
+ if (null == checkItems || checkItems.isEmpty()) {
+ return result;
+ }
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- CheckUpdateResult result = new CheckUpdateResult();
- if (null == checkItems || checkItems.isEmpty()) {
- return result;
- }
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
- }
+ for (CheckItemData item : checkItems) {
+ if (null == item.getCheckId()) {
+ item.setCheckId(checkId);
+ }
+ item.setCompanyId(companyId);
+ if (item.getUpperLimit() == null) {
+ item.setUpperLimit(0.0);
+ }
- for (CheckItemData item : checkItems) {
- if (null == item.getCheckId()) {
- item.setCheckId(checkId);
- }
- item.setCompanyId(companyId);
- if (item.getUpperLimit() == null) {
- item.setUpperLimit(0.0);
- }
+ if (null != item.getDeNum() && item.getDeNum() > 0) {
+ result.setDeSum(result.getDeSum() + item.getDeNum());
+ }
+ if (null != item.getAddNum() && item.getAddNum() > 0) {
+ result.setAddSum(result.getAddSum() + item.getAddNum());
+ }
+ if (null != item.getAddPrice() && item.getAddPrice() > 0) {
+ result.setAddPriceSum(result.getAddPriceSum()
+ + item.getAddPrice());
+ }
+ if (null != item.getDePrice() && item.getDePrice() > 0) {
+ result.setDePriceSum(result.getDePriceSum() + item.getDePrice());
+ }
- if (null != item.getDeNum() && item.getDeNum() > 0) {
- result.setDeSum(result.getDeSum() + item.getDeNum());
- }
- if (null != item.getAddNum() && item.getAddNum() > 0) {
- result.setAddSum(result.getAddSum() + item.getAddNum());
- }
- if (null != item.getAddPrice() && item.getAddPrice() > 0) {
- result.setAddPriceSum(result.getAddPriceSum() + item.getAddPrice());
- }
- if (null != item.getDePrice() && item.getDePrice() > 0) {
- result.setDePriceSum(result.getDePriceSum() + item.getDePrice());
- }
-
- //鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
- int i = checkStandardService.updateCheckItem(item);
- if (i < 1) {
- checkStandardService.insertCheckItem(item);
- }
- }
- return result;
- }
+ // 鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
+ int i = checkStandardService.updateCheckItem(item);
+ if (i < 1) {
+ checkStandardService.insertCheckItem(item);
+ }
+ }
+ return result;
+ }
}
\ No newline at end of file
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
index b299a6f..7ae66fd 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java
@@ -72,36 +72,18 @@
/**
* 鏍规嵁checkId鑾峰彇妫�楠岄」淇℃伅
*
- * checkStandardPR#listCheckItemsByCheckId
+ * checkStandardPR#listCheckItemsByParam
*
* @param param
* @return
*/
@DataProvider
- public List<CheckItemData> listCheckItemsByCheckId(Map<String, Object> param) {
+ public List<CheckItemData> listCheckItemsByParam(Map<String, Object> param) {
String checkId = (String) param.get("checkId");
- String deptId = (String) param.get("deptId");
String foodVariety = (String) param.get("foodVariety");
- return checkStandardManager.listCheckItem(checkId, deptId, foodVariety);
- }
-
- /**
- * 鏍规嵁foodVariety鑾峰彇妫�楠岄」淇℃伅
- *
- * checkStandardPR#listCheckItemsByFoodVariety
- *
- * @param param
- * @return
- */
- @Expose
- public List<CheckItemData> listCheckItemsByFoodVariety(Map<String, Object> param) {
-
- String deptId = (String) param.get("deptId");
- String foodVariety = (String) param.get("foodVariety");
-
- return checkStandardManager.listCheckItem(null, null, foodVariety);
+ return checkStandardManager.listCheckItem(ContextUtil.getCompanyId(),checkId, foodVariety);
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java b/igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java
index bd90724..edaf129 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java
@@ -2,7 +2,6 @@
import com.ld.igds.check.dto.CheckItemData;
-import com.ld.igds.check.dto.CheckStandardData;
import java.util.List;
/**
@@ -51,5 +50,5 @@
*
* @param checkId
*/
- List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety);
+ List<CheckItemData> getCheckItemByStandard(String companyId,String checkId, String foodVariety);
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
index aa5a242..fca817d 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java
@@ -48,15 +48,18 @@
}
@Override
- public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety) {
+ public List<CheckItemData> getCheckItemByStandard(String companyId,String checkId,String foodVariety) {
List<CheckItemData> result = new ArrayList<>();
+
if (StringUtils.isEmpty(foodVariety)) {
return result;
}
+
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getDefaultCompanyId();
}
+
List<CheckStandardData> list = checkStandardMapper.getCheckStandard(companyId, foodVariety);
if (null == list) {
return result;
@@ -65,10 +68,8 @@
CheckItemData item;
for (CheckStandardData data : list) {
item = new CheckItemData();
-
BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
-
if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
item.setOperaSymbolValue(data.getOperaSymbol() + " " + data.getUpperLimit());
}
diff --git a/igds-core/src/main/java/com/ld/igds/common/CoreCommonService.java b/igds-core/src/main/java/com/ld/igds/common/CoreCommonService.java
index 536a313..36d7558 100644
--- a/igds-core/src/main/java/com/ld/igds/common/CoreCommonService.java
+++ b/igds-core/src/main/java/com/ld/igds/common/CoreCommonService.java
@@ -219,15 +219,6 @@
List<DefaultCompany> getCompanyList();
/**
- * 鍙湪鏂颁竴杞嚭鍏ュ簱绗竴杞﹁繘琛屽垵濮嬪寲锛岃幏鍙栨渶鍚庝竴涓簱瀛樿褰曡繘琛屽垽鏂紝骞剁敓鎴愪竴涓柊鐨勮褰曚互渚胯褰曠涓�杞﹀嚭鍏ュ簱浣滀笟鏃堕棿锛�
- * <p>
- * 褰撳墠鏂规硶鍙褰曞嚭搴撶涓�杞﹀拰鍏ュ簱绗竴杞︾殑浜嬩欢鍜屽垽鏂紝婊′粨鍜岀┖浠撻渶瑕佷汉涓鸿褰�
- *
- * @param data
- */
- void initInoutDepotStore(InoutData data);
-
- /**
* 鏍规嵁浠撳簱缂栫爜鑾峰彇褰撳墠浠撳簱鏈�鍚庝竴鏉¤褰�
*
* @param depotId
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
index 1cf5c88..9d99a9f 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CommonDataServiceImpl.java
@@ -8,8 +8,6 @@
import com.ld.igds.common.mapper.CommonMapper;
import com.ld.igds.constant.Constant;
import com.ld.igds.constant.RedisConst;
-import com.ld.igds.inout.InoutConstant;
-import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.models.Depot;
import com.ld.igds.models.DepotConf;
import com.ld.igds.models.DepotStore;
@@ -312,56 +310,6 @@
String key = RedisConst.buildKey(Constant.DEFAULT_PARENT_CODE, "COMPANY_LIST");
return (List<DefaultCompany>) redisUtil.get(key);
- }
-
- @Override
- public void initInoutDepotStore(InoutData data) {
-
- //鍏堜粠缂撳瓨涓幏鍙栦笅淇℃伅锛屾煡鐪嬫槸鍚﹀凡缁忓垵濮嬪寲杩囨暟鎹紝濡傛灉鏈夊垯鐩存帴璺宠繃锛屽鏋滄病鏈夊垯閲嶆柊楠岃瘉
- // String key = RedisConst.buildKey(data.getDepotId(), "DEPOT_STORE", depotStatus);
-// String tag = (String) redisUtil.get(key);
-// if (null != tag) return;
-
-
- //鑾峰彇褰撳墠浠撳簱鏈�鍚庝竴涓簱瀛樿褰�
- DepotStore depotStore = getLastDepotStore(data.getDepotId());
-
- //濡傛灉鏈夋暟鎹紝骞朵笖鐘舵�佺被涓�鑷达紝琛ㄧず缂撳瓨娌℃湁浜嗭紝浣嗘槸宸茬粡鍋氳繃鍒濆鍖�
-// if (null != depotStore && depotStatus.equals(depotStore.getDepotStatus())) {
-// redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
-// return;
-// }
-
- //浠庢潵娌℃湁鍋氫釜搴撳瓨绠＄悊璋冩暣
-// if (null == depotStore) {
-// Depot depot = this.getCacheDepot(data.getCompanyId(), data.getDepotId());
-// depotStore = new DepotStore(depot, depotStatus);
-// if (null != data.getFoodYear()) {
-// depotStore.setFoodYear(data.getFoodYear());
-// }
-//
-// } else { //鏈夎褰曪紝浣嗘槸鐘舵�佷笌褰撳墠浣滀笟涓嶄竴鑷达紝涔熼渶瑕佸垵濮嬪寲
-// depotStore.setDepotStatus(depotStatus);
-// depotStore.setUpdateDate(new Date());
-// depotStore.setUpdateUser(null);
-// }
-
- depotStore.setId(null);
- if (InoutConstant.TYPE_OUT.equals(data.getType())) {
- depotStore.setOutDate(new Date());
- } else {
- depotStore.setStoreDate(new Date());
- }
-
- if (null != data.getFoodYear()) {
- depotStore.setFoodYear(data.getFoodYear());
- }
- depotStore.setRemark("绯荤粺鐢熸垚璁板綍锛岀‘璁よ皟鏁�");
-
- addDepotStore(depotStore, false);
- commonMapper.updateDepotStatus(depotStore.getCompanyId(), depotStore.getDepotId(), depotStore.getDepotStatus());
-
- // redisUtil.set(key, depotStatus, 5 * 24 * 60 * 60);
}
@Override
diff --git a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
index 54c1018..2f36ca3 100644
--- a/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
+++ b/igds-core/src/main/java/com/ld/igds/common/manager/CommonManager.java
@@ -14,7 +14,6 @@
import com.ld.igds.data.SimpleDepot;
import com.ld.igds.grain.dto.GrainData;
import com.ld.igds.grain.service.CoreGrainService;
-import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.models.*;
import com.ld.igds.sys.service.DicTriggerService;
import com.ld.igds.sys.service.SysDeptService;
@@ -26,13 +25,16 @@
import com.ld.igds.warn.data.WarnParam;
import com.ld.igds.warn.service.CoreWarnService;
import com.ld.igds.weather.CoreWeatherService;
+
import lombok.extern.slf4j.Slf4j;
+
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+
import java.util.*;
import java.util.stream.Collectors;
@@ -63,6 +65,7 @@
private CoreWarnService coreWarnService;
@Resource
private RedisUtil redisUtil;
+
/**
* 鑾峰彇鍏ュ簱浣滀笟涓紝浠撳簱涓嬫媺妗嗭紝鍊艰幏鍙栫姸鎬�=闈炴弧浠撶殑绮簱
diff --git a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
index 7882336..bc43862 100644
--- a/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
+++ b/igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
@@ -139,8 +139,7 @@
// 鏁版嵁鐘舵��-姝ｅ父
public static final String RECORD_STATUS_NORMAL = "NORMAL";
- // 鏁版嵁鐘舵��-寮傚父
- public static final String RECORD_STATUS_ERROR = "ERROR";
+
// 鏁版嵁鐘舵��-琛ュ綍
public static final String RECORD_STATUS_ADD = "ADD";
// 鏁版嵁鐘舵��-宸插垹闄�
@@ -165,15 +164,6 @@
// 娴佺▼-澶囨锛堣〃绀烘祦绋嬫暣浣撳畬鎴愬悗澶囨锛�
public static final String PROGRESS_RECORD = "RECORD";
-
-
- public static final String CHECK_ITEM_C01 = "C01";//姘村垎
-
- public static final String CHECK_ITEM_C020101 = "020101";//姘村垎
-
- public static final String CHECK_ITEM_C01010301 = "01010301";//鏉傝川
-
- public static final String CHECK_ITEM_C02 = "C02";//鏉傝川
/**
@@ -239,5 +229,4 @@
return "";
}
-
}
diff --git a/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java b/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
index 8e937ea..4205b9f 100644
--- a/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
+++ b/igds-core/src/main/java/com/ld/igds/sys/DicTriggerPR.java
@@ -3,7 +3,6 @@
import com.bstek.bdf2.core.context.ContextHolder;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
-import com.bstek.dorado.data.provider.Page;
import com.ld.igds.camera.CameraUtil;
import com.ld.igds.constant.BizType;
import com.ld.igds.constant.Constant;
@@ -16,7 +15,6 @@
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
import java.util.Map;
diff --git a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
index 4bd94ef..1e58093 100644
--- a/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
+++ b/igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java
@@ -28,7 +28,6 @@
public String saveDicArea(DicArea data) {
Session session = this.getSessionFactory().openSession();
try {
-
session.saveOrUpdate(data);
} finally {
session.flush();
diff --git a/igds-doc/sql/update-v35-to-v40.sql b/igds-doc/sql/update-v35-to-v40.sql
index 8eb63a1..e67f078 100644
--- a/igds-doc/sql/update-v35-to-v40.sql
+++ b/igds-doc/sql/update-v35-to-v40.sql
@@ -45,3 +45,6 @@
UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '33' WHERE DEPOT_STATUS_ ='07';
UPDATE D_DEPOT_STORE SET DEPOT_STATUS_ = '34' WHERE DEPOT_STATUS_ ='09';
+-- 璋冩暣鍑哄叆搴撴暟鎹姸鎬�
+UPDATE D_INOUT_RECORD SET RECORD_STATUS_ ='DEL' WHERE RECORD_STATUS_='ERROR';
+
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
index 31d0276..5c201ae 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -25,6 +25,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.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;
@@ -168,15 +169,6 @@
}
}
- public InoutData inoutProgressQuery(InoutData data) throws Exception {
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setPlateNum(data.getPlateNum());
- param.setIntelCard(data.getIntelCard());
- param.setType(data.getType());
-
- return inoutService.inoutProgressQuery(param);
- }
/**
* 鍖栭獙缁撴灉涓嶉�氳繃鏃舵牎楠岄厤缃俊鎭�
@@ -301,75 +293,6 @@
data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
data.setCompleteUser(ContextUtil.getLoginUserCName());
data.setProgress(nextProgress);
- }
-
- return data;
- }
-
- /**
- * 褰撳墠鏂规硶闇�瑕佸垹闄�
- * <p>
- * 鏍规嵁闇�瑕佷繚瀛樼殑鏁版嵁锛岃皟鏁翠笅涓�涓祦绋嬬姸鎬� 涓嶅悓鐨勪粨搴撶粍缁囨祦绋嬪彲鑳戒笉涓�鏍凤紝闇�瑕佹牴鎹疄闄呰皟鏁�
- *
- * @param data
- * @return
- */
- private InoutData updateBasicInfo(InoutData data, InoutSysConf sysConf) {
- if (InoutConstant.PROGRESS_REGISTER.equals(data.getProgress())) {
- data.setRegisterTime(new Date());
- data.setRegisterUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
-
- return data;
- }
-
- if (InoutConstant.PROGRESS_CHECK.equals(data.getProgress())) {
- data.setCheckUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- return data;
- }
-
- if (InoutConstant.PROGRESS_WEIGHT_EMPTY.equals(data.getProgress())) {
- data.setEmptyWeightTime(new Date());
- data.setEmptyWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
-
- return data;
- }
-
- if (InoutConstant.PROGRESS_HANDLE.equals(data.getProgress())) {
- // 鏌ヨ缂撳瓨涓粨搴撲俊鎭紝鏍规嵁浠撳簱id璁剧疆鍊间粨浜轰负浠撳簱淇濈鍛�
- Depot depot = commonService.getCacheDepot(data.getCompanyId(),
- data.getDepotId());
- data.setHandleUser(depot == null ? "" : depot.getStoreKeeperName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
-
- return data;
- }
-
- if (InoutConstant.PROGRESS_WEIGHT_FULL.equals(data.getProgress())) {
- data.setFullWeightTime(new Date());
- data.setFullWeightUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- data.setCompleteTime(DateUtils.addMinutes(new Date(), 2));
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- }
- return data;
- }
-
- if (InoutConstant.PROGRESS_CARD_BACK.equals(data.getProgress())) {
- data.setCompleteTime(new Date());
- data.setCompleteUser(ContextUtil.getLoginUserCName());
- data.setProgress(getNextProgress(data.getProgress(),
- data.getType(), sysConf));
-
- return data;
}
return data;
@@ -530,8 +453,6 @@
// 娣诲姞琛ュ崟鏁版嵁
String msg = inoutService.insertData(data);
- // 鍒濆鍖栭獙璇佸嚭鍏ュ簱搴撳瓨
- commonService.initInoutDepotStore(data);
return msg;
}
@@ -547,9 +468,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "绯荤粺锛氬紓甯哥粓姝㈢殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
}
// 濡傛灉娴佺▼鏈粨鏉燂紝鍙洿鏂版暟鎹�
@@ -572,9 +490,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(record.getRecordStatus())) {
return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(record.getRecordStatus())) {
- return "绯荤粺锛氬紓甯哥粓姝㈢殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
- }
// 淇濆瓨妫�娴嬮」鐩�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
@@ -595,49 +510,6 @@
return null;
}
- /**
- * 鍒犻櫎鎿嶄綔 鍒犻櫎鏁版嵁涓鸿蒋鍒犻櫎锛屽垹闄ゆ暟鎹悗闇�瑕佹牴鎹垹闄ゆ儏鍐佃仈鍔ㄥ簱瀛樼瓑淇℃伅
- *
- * @param data
- * @param selected 鏄惁宸茬粡鏌ヨ杩囨暟鎹�
- * @return
- * @throws Exception
- */
- @Transactional
- public String delInoutData(InoutData data, boolean selected)
- throws Exception {
-
- // 閬垮厤椤甸潰缂撳瓨棣栧厛鑾峰彇鏁版嵁搴撲腑鏈�鏂扮殑褰撳墠鏁版嵁淇℃伅
- InoutParam param = new InoutParam();
- param.setCompanyId(data.getCompanyId());
- param.setId(data.getId());
- param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц鍒犻櫎锛屽師鍥狅細"
- + data.getRemarks());
-
- if (!selected) {
- data = inoutService.inoutQueryById(param);
-
- if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
- return "宸茬粡鍒犻櫎鐨勬暟鎹紝涓嶆敮鎸侀噸澶嶅垹闄わ紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR
- .equals(data.getRecordStatus())) {
- return "褰撳墠鏁版嵁宸茬粡琚爣璁颁负寮傚父锛屼笉鏀寔鍒犻櫎锛�";
- }
- }
-
- // 鎵ц鍒犻櫎
- param.setProgress(InoutConstant.PROGRESS_RECORD);
- param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
- param.setType(data.getType());
- inoutService.deleteData(param);
-
- // 濡傛灉娴佺▼鏈粨鏉燂紝鐩存帴鍒犻櫎锛屼笉鐗垫壇鍒拌仈鍔ㄨ皟鏁�
- if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return null;
- }
- return null;
- }
/**
* 寮傚父缁堟鎿嶄綔 璁剧疆寮傚父 涓轰簡閬垮厤椤甸潰鏁版嵁缂撳瓨锛岄渶瑕侀噸鏂拌幏鍙栨渶鏂版暟鎹垽鏂�
@@ -646,26 +518,25 @@
* @return
* @throws Exception
*/
- @Transactional
- public String errorInoutData(InoutData data) {
-
+ public String errorInoutData(InoutData data) throws Exception {
InoutParam param = new InoutParam();
param.setCompanyId(data.getCompanyId());
param.setId(data.getId());
- param.setMsg(" [" + ContextUtil.getLoginUserCName() + "]鎵ц寮傚父缁堟锛屽師鍥狅細"
- + data.getRemarks());
+
+ param.setMsg(" 浜�" + DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm") + " 琚� " + ContextUtil.getLoginUserCName() + " 鎵ц缁堟锛屽師鍥狅細" + data.getRemarks());
+
data = inoutService.inoutQueryById(param);
- if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
- return "宸茬粡鍒犻櫎鐨勬暟鎹紝涓嶆敮鎸佸紓甯稿鐞嗭紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "涓嶆敮鎸侀噸澶嶅紓甯稿鐞嗭紒";
- }
if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
return "娴佺▼缁撴潫鐨勬暟鎹笉鏀寔寮傚父澶勭悊锛�";
}
+ if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
+ return "褰撳墠淇℃伅宸插仛寮傚父澶勭悊锛屼笉鏀寔閲嶅鎵ц锛�";
+ }
+
+ param.setDeptId(data.getDeptId());
+ param.setType(data.getType());
return inoutService.inoutStop(param);
}
@@ -676,27 +547,25 @@
* @return
*/
public String completeInoutData(InoutData data) throws Exception {
- if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
- return "宸茬粡鍒犻櫎鐨勬暟鎹紝涓嶆敮鎸佸畬鎴愶紒";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "寮傚父缁堟鐨勬暟鎹紝涓嶆敮鎸佸畬鎴愶紒";
- }
- if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return "娴佺▼宸插畬鎴愮殑鏁版嵁锛屼笉鏀寔瀹屾垚锛�";
- }
-
// 浠庢柊鏌ヨ鏁版嵁
InoutParam param = new InoutParam();
param.setId(data.getId());
param.setCompanyId(data.getCompanyId());
param.setType(data.getType());
- InoutData cuData = inoutService.inoutProgressQuery(param);
+ InoutData cuData = inoutService.inoutQueryById(param);
if (null == cuData) {
return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
}
+
if (!cuData.getProgress().equals(data.getProgress())) {
return "褰撳墠杞﹁締娴佺▼鐘舵�佸凡缁忓彉鍖栵紝璇峰埛鏂伴〉闈㈤噸鏂版搷浣滐紒";
+ }
+
+ if (InoutConstant.RECORD_STATUS_DEL.equals(cuData.getRecordStatus())) {
+ return "褰撳墠淇℃伅宸茬粡琚紓甯哥粓姝紝涓嶆敮鎸佸綋鍓嶅鐞嗭紒";
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(cuData.getProgress())) {
+ return "娴佺▼宸插畬鎴愮殑鏁版嵁锛屼笉鏀寔瀹屾垚锛�";
}
if (null == data.getCompleteTime()) {
@@ -718,10 +587,7 @@
String msg = inoutService.quickComplete(data);
- if (null == msg) {
- data.setProgress(InoutConstant.PROGRESS_RECORD);
- commonService.initInoutDepotStore(data);
- }
+
return msg;
}
@@ -1093,8 +959,6 @@
+ e.getMessage(), null);
}
}
-
-
/**
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
index fec9413..23e0fca 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
@@ -47,7 +47,7 @@
* @return
* @throws Exception
*/
- String inoutStop(InoutParam param);
+ String inoutStop(InoutParam param) throws Exception;
/**
* 鏍规嵁鏁版嵁娣诲姞锛�
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java b/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
index c30c147..e4b9b80 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/JInoutReportService.java
@@ -126,7 +126,6 @@
args.put("typeOver", Constant.LOSS_OVER_OVER);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
args.put("start", DateUtil.getCurZero(start));
args.put("end", DateUtil.getNextZero(end));
@@ -182,7 +181,6 @@
args.put("companyId", ContextUtil.getCompanyId());
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
// 鑾峰彇璺濈寮�濮嬫椂闂翠箙鏈�杩戠殑鏁版嵁锛屽綋鍓嶅ぉ鐨勭浜斿垎閽�
Date date = DateUtil.getCurZero(start);
args.put("start", DateUtils.addMinutes(date, 5));
@@ -234,7 +232,6 @@
args.put("companyId", ContextUtil.getCompanyId());
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
args.put("end", DateUtil.getNextZero(end));
log.debug("====鎵цSLQ3={}", sql.toString());
@@ -436,7 +433,6 @@
args.put("typeOver", Constant.LOSS_OVER_OVER);
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
args.put("start", DateUtil.getCurZero(start));
args.put("end", DateUtil.getNextZero(end));
@@ -488,7 +484,6 @@
args.put("companyId", ContextUtil.getCompanyId());
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
// 鑾峰彇璺濈寮�濮嬫椂闂翠箙鏈�杩戠殑鏁版嵁锛屽綋鍓嶅ぉ鐨勭浜斿垎閽�
Date date = DateUtil.getCurZero(start);
args.put("start", DateUtils.addMinutes(date, 5));
@@ -541,7 +536,6 @@
args.put("companyId", ContextUtil.getCompanyId());
args.put("progress", InoutConstant.PROGRESS_RECORD);
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
args.put("end", DateUtil.getNextZero(end));
log.debug("====鎵цSLQ3={}", sql.toString());
@@ -709,7 +703,6 @@
Map<String, Object> args = new HashMap<>();
args.put("transType", TransType.TYPE_3.getCode());
args.put("recordStatusDel", InoutConstant.RECORD_STATUS_DEL);
- args.put("recordStatusError", InoutConstant.RECORD_STATUS_ERROR);
args.put("typeNone", InoutConstant.TYPE_NONE);
args.put("typeLoss", Constant.LOSS_OVER_LOSS);
args.put("typeOver", Constant.LOSS_OVER_OVER);
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
index b89eccf..eeec666 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -15,7 +15,6 @@
import com.ld.igds.inout.mapper.InoutCheckMapper;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutService;
-import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
@@ -57,8 +56,6 @@
if (null != result) {
return result;
}
-
-
List<InoutData> list = inoutMapper.inoutProgressQuery(param);
if (null == list || list.size() == 0)
return null;
@@ -106,16 +103,18 @@
}
@Override
- public String inoutStop(InoutParam param) {
+ public String inoutStop(InoutParam param) throws Exception {
if (StringUtils.isEmpty(param.getCompanyId())) {
- param.setCompanyId(ContextUtil.getCompanyId());
+ param.setCompanyId(ContextUtil.getDefaultCompanyId());
}
+
+
+ param.setProgress(InoutConstant.PROGRESS_RECORD);
+ param.setRecordStatus(InoutConstant.RECORD_STATUS_DEL);
+
// 缂撳瓨涓垹闄�
delFromCache(param.getDeptId(), param.getType(), param.getId());
-
- param.setProgress(InoutConstant.PROGRESS_RECORD);
- param.setRecordStatus(InoutConstant.RECORD_STATUS_ERROR);
inoutMapper.inoutStop(param);
@@ -299,7 +298,7 @@
@Override
public String quickComplete(InoutData data) throws Exception {
if (null == data.getCompanyId()) {
- data.setCompanyId(ContextUtil.getCompanyId());
+ data.setCompanyId(ContextUtil.getDefaultCompanyId());
}
if (null == data.getCompleteTime()) {
data.setCompleteTime(new Date());
@@ -310,7 +309,6 @@
if (null == data.getEmptyWeightTime()) {
data.setEmptyWeightTime(new Date());
}
-
//璋冩暣鏃堕棿宸�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
@@ -339,15 +337,10 @@
// 璁剧疆娴佺▼缁撴潫
data.setProgress(InoutConstant.PROGRESS_RECORD);
-
- if (null == data.getFoodType()) {
- // 鏍规嵁浠撳簱淇℃伅鑾峰彇缂撳瓨
- Depot depot = commonService.getCacheDepot(data.getCompanyId(), data.getDepotId());
- data.setFoodType(depot.getFoodType());
- }
-
+ //鎵ц鏇存柊
inoutMapper.updateData(data);
+ //鏇存柊缂撳瓨
updateInoutCache(data);
return null;
@@ -368,8 +361,6 @@
} else {
setInoutCache(data.getDeptId(), data);
}
-
-
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
index a2c0721..40bf192 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java
@@ -73,14 +73,6 @@
}
/**
- * 鍒犻櫎鏁版嵁 inoutDataPR#delInoutData
- */
- @DataResolver
- public String delInoutData(InoutData data) throws Exception {
- return inoutManager.delInoutData(data, false);
- }
-
- /**
* inoutDataPR#errorInoutData 鍑哄叆搴撴暟鎹墽琛� 寮傚父缁堟
*
* @param data
@@ -88,6 +80,7 @@
* @throws Exception
*/
@DataResolver
+ @Transactional
public String errorInoutData(InoutData data) throws Exception {
return inoutManager.errorInoutData(data);
}
@@ -119,9 +112,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
- }
if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
return "鏈畬鎴愮殑鏁版嵁涓嶆敮鎸佹墦鍗帮紒";
}
@@ -145,9 +135,6 @@
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return null;
}
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return null;
- }
if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
return null;
}
@@ -166,9 +153,6 @@
public String printCheckBill(InoutData data) throws Exception {
if (InoutConstant.RECORD_STATUS_DEL.equals(data.getRecordStatus())) {
return "鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
- }
- if (InoutConstant.RECORD_STATUS_ERROR.equals(data.getRecordStatus())) {
- return "寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�";
}
return inoutReportManager.inCheckBill(data);
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList-bak20111110.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList-bak20111110.view.xml
deleted file mode 100644
index 38bab34..0000000
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList-bak20111110.view.xml
+++ /dev/null
@@ -1,1502 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ViewConfig>
- <Arguments/>
- <Context/>
- <Model>
- <DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-if(arg.property =="foodVariety"){
- checkByFood(arg.newValue);
-}</ClientEvent>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">绮瀹氫环</Property>
- <Property name="required">false</Property>
- </PropertyDef>
- <Reference name="checkItems">
- <Property name="parameter">
- <Entity>
- <Property name="checkId">$${this.checkId}</Property>
- <Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
- </Entity>
- </Property>
- <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
- <Property name="dataType">[dtCheckItems]</Property>
- </Reference>
- </DataType>
- <DataType name="dtQuery">
- <Property name="creationType">com.ld.igds.inout.dto.InoutParam</Property>
- <PropertyDef name="type">
- <Property name="label">鍑哄叆搴撶被鍨�</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">鎵�灞炲垎搴�</Property>
- </PropertyDef>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">浠撳簱</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="plateNum">
- <Property name="label">杞﹁埞鍙�</Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="progress">
- <Property></Property>
- <Property name="label">娴佺▼杩涘害</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("PROCESS_STATUS_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="recordStatus">
- <Property></Property>
- <Property name="label">鏁版嵁鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="checkStatus">
- <Property></Property>
- <Property name="label">鏄惁鍚堟牸</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("CHECK_STATUS")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="start">
- <Property name="label">寮�濮嬫椂闂�</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="end">
- <Property name="label">鎴鏃堕棿</Property>
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="userId">
- <Property name="label">韬唤璇�</Property>
- </PropertyDef>
- <PropertyDef name="orderTag">
- <Property name="defaultValue">DESC</Property>
- <Property name="label">鎺掑簭瑙勫垯</Property>
- <Property name="mapping">
- <Property name="mapValues">
- <Collection>
- <Entity>
- <Property name="code">DESC</Property>
- <Property name="name">鏃堕棿闄嶅簭</Property>
- </Entity>
- <Entity>
- <Property name="code">ASC</Property>
- <Property name="name">鏃堕棿鍗囧簭</Property>
- </Entity>
- </Collection>
- </Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- </DataType>
- <DataType name="dtCheckItems">
- <Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
- <PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
- </PropertyDef>
- <PropertyDef name="checkId">
- <Property></Property>
- <Property name="label">妫�娴嬬紪鐮�</Property>
- </PropertyDef>
- <PropertyDef name="companyId">
- <Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardId">
- <Property></Property>
- <Property name="label">妫�娴嬮」缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="standardName">
- <Property></Property>
- <Property name="label">鍖栭獙椤�</Property>
- </PropertyDef>
- <PropertyDef name="unit">
- <Property></Property>
- <Property name="label">鍗曚綅</Property>
- </PropertyDef>
- <PropertyDef name="upperLimit">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯涓婇檺</Property>
- </PropertyDef>
- <PropertyDef name="lowerLimit">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯涓嬮檺</Property>
- </PropertyDef>
- <PropertyDef name="value">
- <Property></Property>
- <Property name="label">妫�娴嬪��</Property>
- </PropertyDef>
- <PropertyDef name="remarks">
- <Property></Property>
- <Property name="label">鍖栭獙缁撴灉</Property>
- </PropertyDef>
- </DataType>
- </Model>
- <View layout="padding:5;regionPadding:5">
- <ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
-var EDIT = "${request.getParameter('edit')}";
-
-var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-
-//濡傛灉edit鏈夊�艰〃绀洪殣钘廇DD鍜岀紪杈戞寜閽�
-if(EDIT){
- view.get("#btnAdd").set("visible",false);
- view.get("#btnEdit").set("visible",false);
- view.get("#btnDel").set("visible",false);
- view.get("#btn2End").set("visible",false);
-}
-
-//濡傛灉鏄嚭搴撹鍗曪紝闅愯棌鍖栭獙椤�
-view.get("#columnDeSum").set("visible",true);
-view.get("#label1").set("text","娉細涓嶈鍏ョ粨绠楅噸閲忥紝姝ｆ暟=澧為噸锛岃礋鏁�=鎵ｉ噸");
-
-if("OUT" == TYPE){
- //瑾挎暣鍚嶇О
- view.get("#columnDeSum").set("visible",false);
- view.get("#label1").set("text","娉細鍑哄簱姘村垎澧為噸璁板叆缁撶畻閲嶉噺");
- 
- view.get("#dataGridCheckItem").set("visible",false);
-};
-
-//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
-view.get("#dsQuery").insert({
- type:TYPE,
- deptId:deptId
-});
-
-//鏌ヨ
-query = function(){
- var data = view.get("#dsQuery.data");
- view.get("#dsMain").set("parameter",data).flushAsync();
-};
-query();
-
-
-//鏂板
-add = function(){
- view.get("#ajaxInitAdd").set("parameter",TYPE).execute(function(data){
- view.get("#dsMain").insert(data);
- view.get("#dsMain.data:#").set("deptId",deptId);////浠庨�夋嫨涓幏鍙栧垎搴撲俊鎭�
- view.get("#dialogMain").show();
- });
-};
-
-//缂栬緫锛屽彧鏈夋祦绋嬬粨鏉熺殑鎵嶅彲浠ヤ慨鏀�
-edit = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if ("RECORD" == data.get("progress")) {
- view.get("#btnOK").set("visible",true);
- }else{
- view.get("#btnOK").set("visible",false);
- }
- view.get("#dialogMain").show();
-};
-
-//涓讳俊鎭獥鍙ｅ叧闂�
-cancelMain = function(){
- view.get("#dsMain.data:#").cancel();
- view.get("#btnComplete").set("visible",false);
- view.get("#btnOK").set("visible",true);
- view.get("#dialogMain").hide();
-};
-
-//寮傚父鎿嶄綔
-showAbnormal = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- view.get("#dialogAbnormal").show();
- 
- view.get("#textAbnormal").set("value",null);
-};
-
-//鍒犻櫎
-del = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textDel = view.get("#textAbnormal.text");
- if(!textDel){
- $notify("璇峰～鍐欏紓甯稿垹闄ゅ師鍥狅紒");
- return;
- }
- data.set("remarks",textDel);
- view.get("#ajaxDel").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- view.get("#dialogAbnormal").close();
- }
- });
-};
-
-//杩借釜
-showImg = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if (!data) return;
- var user = encodeURIComponent(data.get("userName"));
- var plateNum = encodeURIComponent(data.get("plateNum"));
- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + data.get("id")+"&plateNum="+plateNum+"&user="+user);
- view.get("#dialogImg").show();
-};
-
-todoError = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textError = view.get("#textAbnormal.text");
- 
- if(!textError){
- $alert("璇疯鏄庡紓甯哥粓姝㈠師鍥狅紒锛�");
- return;
- }
- data.set("remarks",textError);
- view.get("#ajaxError").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- view.get("#dialogAbnormal").close();
- query();
- $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
- }
- });
-};
-
-//娴佺▼瀹屾垚-寮�濮�
-completeStart = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if( data.validate() != 'ok'){
- $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
- }
- 
- view.get("#btnComplete").set("visible",true);
- view.get("#btnOK").set("visible",false);
- view.get("#dialogMain").show();
-};
-//娴佺▼瀹屾垚-鎵ц
-completeExe = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- if (data.validate() != 'ok') {
- $notify("璇峰～鍐欏畬鏁翠俊鎭紒锛�");
- return;
- }
- 
- view.get("#ajaxComplete").set("parameter",data).execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- $alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
- view.get("#btnComplete").set("visible",false);
- view.get("#dialogMain").hide();
- }
- });
-};
-
-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dataGridMain.currentEntity");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
- }
- });
-};
-
-//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
-checkByFood = function(foodVariety){
- if(TYPE == "IN"){
- view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
- if(result){
- var data = view.get("#dsMain.data:#");
- data.set("checkItems",result);
- }
- });
- }
-};
-</ClientEvent>
- <ClientEvent name="onCreate">
-//鑷姩閲嶉噺璁＄畻
-deAutoByPer = function(){
- var curData = view.get("#dsMain.data:#");
- var netWeight = 0, deImpurity = 0, deWet = 0, deSum = 0, settleWeight = 0;
- // 璁＄畻鍑�閲�
- netWeight = curData.get("fullWeight") - curData.get("emptyWeight");
-
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜庣瓑浜�0锛屽綋鍓嶈绠椾笉姝ｇ‘锛�");
- return;
- }
- 
- if (curData.get("type") == "OUT") {
- // 鏉傝川鎵ｉ噸
- if (curData.get("impurity") > 0) {
- deImpurity = (netWeight * curData.get("impurity") / 100.00).toFixed(0);
- }
- 
- // 姘村垎澧為噸 鍙栨秷姘村垎鎵ｉ噸缁熻
- if (curData.get("wet") > 0) {
- deWet = (netWeight * curData.get("wet") / 100.00).toFixed(0);
- }
- }
- // 鎬绘墸閲�
- deSum = Number(deImpurity) + Number(curData.get("deOther"))
- + Number(curData.get("deHandle")) + Number(curData.get("dePack"));
-
- // 缁撶畻鍑�閲�,鍏ュ簱鍙栨秷姘村垎淇℃伅锛屽嚭搴撻渶瑕佸姞涓婃按鍒�
- if(curData.get("type")=="IN"){
- //deSum = deSum + Number(deWet);
- deSum = deSum.toFixed(0);
- settleWeight = Number(netWeight) - Number(deSum);
- }else{
- deSum = deSum.toFixed(0);
- settleWeight = Number(netWeight) - Number(deSum) + Number(deWet);
- }
- settleWeight = settleWeight.toFixed(0);
-
- curData.set("deImpurity",deImpurity);
- curData.set("deWet",deWet);
- curData.set("deSum",deSum);
- curData.set("settleWeight",settleWeight);
- curData.set("netWeight",netWeight);
- //console.log(curData);
-};
-
-//鑷姩璁＄畻
-deAutoByWeight = function(){
- //console.log("++++++++++++++");
- var curData = view.get("#dsMain.data:#");
- var netWeight = 0, impurity = curData.get("impurity"), wet = curData.get("wet"), deSum = 0, settleWeight = 0;
- // 鍑�閲�
- netWeight = curData.get("fullWeight") - curData.get("emptyWeight");
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜庣瓑浜�0锛屽綋鍓嶈绠椾笉姝ｇ‘锛�");
- return;
- }
- 
- if (curData.get("type") == "OUT") {
- // 鏉傝川-鐧惧垎姣�
- if (curData.get("deImpurity") > 0) {
- impurity = (curData.get("deImpurity") / netWeight * 100).toFixed(2);
- }
- // 姘村垎 -鐧惧垎姣� 鍙栨秷姘村垎鎵ｉ噸缁熻
- if (curData.get("deWet") > 0) {
- wet = (curData.get("deWet") / netWeight * 100).toFixed(2);
- }
- }
- 
- // 鎬绘墸閲�= 鏉傝川鎵ｉ噸 + 涓嶅畬鍠勬墸閲� + 姘斾綋鎵ｉ噸 + 鍊间粨鎵ｉ噸 + 鍖呰鎵ｉ噸
- deSum = Number(curData.get("deImpurity")) 
- + Number(curData.get("deOther")) + Number(curData.get("deHandle"))
- + Number(curData.get("dePack"));
- 
- //缁撶畻鍑�閲嶏紝鍏ュ簱鍙栨秷姘村垎璁＄畻锛屽嚭搴撳姞涓婃按鍒�
- if (curData.get("type") == "IN") {
- //deSum = deSum + Number(curData.get("deWet"));
- deSum = deSum.toFixed(0);
- settleWeight = Number(netWeight) - Number(deSum);
- }else{
- deSum = deSum.toFixed(0);
- settleWeight = Number(netWeight) - Number(deSum) + Number(curData.get("deWet"));
- }
- settleWeight = settleWeight.toFixed(0);
- curData.set("impurity",impurity);
- curData.set("wet",wet);
- curData.set("deSum",deSum);
- curData.set("settleWeight",settleWeight);
- curData.set("netWeight",netWeight);
-};</ClientEvent>
- <Property name="packages">font-awesome,css-common</Property>
- <Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
- <DataSet id="dsMain">
- <Property name="dataType">[dtMain]</Property>
- <Property name="pageSize">20</Property>
- <Property name="dataProvider">inoutDataPR#pageInoutData</Property>
- <Property name="loadMode">manual</Property>
- </DataSet>
- <DataSet id="dsQuery">
- <Property name="dataType">dtQuery</Property>
- </DataSet>
- <Container layout="regionPadding:10" layoutConstraint="top">
- <Property name="exClassName">bg-color</Property>
- <Property name="contentOverflow">hidden</Property>
- <Property name="height">55</Property>
- <Label layoutConstraint="left">
- <Property name="text">鑿滃崟鏍忥細</Property>
- </Label>
- <Button id="btnAdd" layoutConstraint="left">
- <ClientEvent name="onClick">add();</ClientEvent>
- <Property name="caption">琛ュ崟</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- </Button>
- <Button id="btnEdit" layoutConstraint="left">
- <ClientEvent name="onClick">edit();</ClientEvent>
- <Property name="caption">缂栬緫</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-pencil</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button id="btnDel" layoutConstraint="left">
- <ClientEvent name="onClick">showAbnormal();</ClientEvent>
- <Property name="caption">寮傚父鎿嶄綔</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-minus</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">showImg();</ClientEvent>
- <Property name="caption">杩借釜</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-picture-o</Property>
- </Button>
- <Button id="btn2End" layoutConstraint="left">
- <ClientEvent name="onClick">completeStart();</ClientEvent>
- <Property name="caption">蹇�熺粨鏉�</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="hideMode">display</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">琛ユ墦妫�楠屽崟</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-print</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-if (!data) {
- $alert("璇峰厛閫夋嫨鏁版嵁锛�");
- return;
-}
-
-var transType = data.get("transType");
-if(transType == "3"){
- printShipWeight();
-}else{
- printWeight();
-}</ClientEvent>
- <Property name="caption">琛ユ墦杩囩鍗�</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-print</Property>
- </Button>
- <Button layoutConstraint="left">
- <ClientEvent name="onClick">printPay();</ClientEvent>
- <Property name="caption">鎵撳嵃缁撶畻鍗�</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">瀵煎嚭EXCEL</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-file-excel-o</Property>
- <Property name="action">exportExcel</Property>
- </Button>
- <Button layoutConstraint="left">
- <Property name="caption">鍏朵粬鎵撳嵃</Property>
- <Property name="exClassName">btn-warm</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="menu">menuEdit</Property>
- </Button>
- </Container>
- <AutoForm layoutConstraint="top">
- <Property name="cols">*,*,*,*</Property>
- <Property name="dataSet">dsQuery</Property>
- <Property name="exClassName">bg-color</Property>
- <AutoFormElement>
- <Property name="name">start</Property>
- <Property name="property">start</Property>
- <Property name="trigger">defaultDateDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">end</Property>
- <Property name="property">end</Property>
- <Property name="trigger">defaultDateDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Property name="trigger">autoOpenMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">progress</Property>
- <Property name="property">progress</Property>
- <Property name="trigger">autoOpenMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">recordStatus</Property>
- <Property name="property">recordStatus</Property>
- <Property name="trigger">autoOpenMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkStatus</Property>
- <Property name="property">checkStatus</Property>
- <Property name="trigger">autoOpenMappingDropDown2</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">orderTag</Property>
- <Property name="property">orderTag</Property>
- <Property name="trigger">autoMappingDropDown1</Property>
- <Editor/>
- </AutoFormElement>
- <Container layout="hbox regionPadding:15">
- <Button>
- <ClientEvent name="onClick">query();
-</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="exClassName">btn-normal</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var type ="${request.getParameter('type')}";
-var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
-view.get("#dsQuery").setData({type:type,deptId:deptId});</ClientEvent>
- <Property name="exClassName">btn-warn</Property>
- <Property name="iconClass">fa fa-refresh</Property>
- <Property name="caption">閲嶇疆</Property>
- </Button>
- </Container>
- </AutoForm>
- <Container layoutConstraint="center">
- <Property name="exClassName">bg-color</Property>
- <DataGrid id="dataGridMain" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">edit();</ClientEvent>
- <ClientEvent name="onDataRowClick">//瀹炵幇鐐瑰嚮鍗抽�変腑
-//self.set("selection",arg.data);
- </ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="readOnly">true</Property>
- <Property name="dynaRowHeight">false</Property>
- <Property name="selectionMode">multiRows</Property>
- <RowSelectorColumn/>
- <DataColumn name="id">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.dom.style.color = "#f67d06";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">id</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="plateNum">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">plateNum</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="customerName">
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="width">250</Property>
- </DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="depotId">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">depotId</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="fullWeight">
- <Property name="property">fullWeight</Property>
- <Property name="caption">姣涢噸</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="emptyWeight">
- <Property name="property">emptyWeight</Property>
- <Property name="caption">鐨噸</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="deWet">
- <Property name="property">deWet</Property>
- <Property name="width">100</Property>
- <Property name="caption">姘村垎澧為噸</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn id="columnDeSum">
- <Property name="property">deSum</Property>
- <Property name="width">100</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="align">center</Property>
- <Property name="name">deSum</Property>
- </DataColumn>
- <DataColumn name="settleWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">settleWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="progress">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">progress</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="recordStatus">
- <Property name="property">recordStatus</Property>
- <Property name="align">center</Property>
- <Property name="width">100</Property>
- <Property name="visible">false</Property>
- </DataColumn>
- <DataColumn name="completeTime">
- <Property name="property">completeTime</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
- <Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsMain</Property>
- </DataPilot>
- </Container>
- <Dialog id="dialogMain">
- <Property name="closeable">false</Property>
- <Property name="caption">琛ㄥ崟淇℃伅</Property>
- <Property name="width">1200</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="showCaptionBar">false</Property>
- <Buttons>
- <Button id="btnOK">
- <ClientEvent name="onClick">var data = view.get("#dsMain.data:#");
-if(data.validate() != 'ok'){
- $notify("鏁版嵁鏍￠獙澶辫触锛侊紒");
- return;
-}
-view.get("#uaSave").execute(function(result){
- if(result){
- $alert(result);
- return;
- }
- $notify("鏁版嵁鎵ц瀹屾垚锛侊紒");
- self.get("parent").hide();
-});</ClientEvent>
- <Property name="caption">纭畾淇濆瓨</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-normal</Property>
- </Button>
- <Button id="btnComplete" layoutConstraint="left">
- <ClientEvent name="onClick">completeExe();</ClientEvent>
- <Property name="caption">缁撴潫娴佺▼</Property>
- <Property name="exClassName">btn-default</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">false</Property>
- </Button>
- <Button id="btnAddCheck">
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-var list = data.get("checkItems");
-
-list.insert({});
-console.log(list);
-</ClientEvent>
- <Property name="caption">鏂板鍖栭獙椤�</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">true</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">cancelMain();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <TabControl>
- <ClientEvent name="onTabChange">if(arg.newTab.get("name") == "tabCheck"){
- view.get("#btnAddCheck").set("visible",true);
-}else{
- view.get("#btnAddCheck").set("visible",false);
-}</ClientEvent>
- <ControlTab>
- <Property name="caption">鍩虹淇℃伅</Property>
- <Property name="iconClass">fa fa-download</Property>
- <Property name="width">150</Property>
- <Property name="name">tabCommon</Property>
- <Container>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">鍩烘湰淇℃伅</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userName</Property>
- <Property name="property">userName</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">userContact</Property>
- <Property name="property">userContact</Property>
- <Property name="label">鑱旂郴鐢佃瘽</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">transType</Property>
- <Property name="property">transType</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">姹借溅</Property>
- <Property name="value">1</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鐏溅</Property>
- <Property name="value">2</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">杞埞</Property>
- <Property name="value">3</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">鍏朵粬</Property>
- <Property name="value">4</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
- <Property name="trigger">ddCustomer</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <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>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodYear</Property>
- <Property name="property">foodYear</Property>
- <Property name="trigger">yearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">registerTime</Property>
- <Property name="property">registerTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">noticeName</Property>
- <Property name="property">noticeName</Property>
- <Property name="trigger">ddNotice</Property>
- <Property name="editable">false</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細閫夋嫨鍏宠仈閫氱煡鍗�</Property>
- </Label>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">绉伴噸淇℃伅锛堝崟浣嶏細KG锛�</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</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">emptyWeight</Property>
- <Property name="property">emptyWeight</Property>
- <Editor/>
- </AutoFormElement>
- <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">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">deImpurity</Property>
- <Property name="property">deImpurity</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//deAutoByPer();</ClientEvent>
- <Property name="name">impurity</Property>
- <Property name="property">impurity</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement id="deWet">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">deWet</Property>
- <Property name="property">deWet</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//deAutoByPer();</ClientEvent>
- <Property name="name">wet</Property>
- <Property name="property">wet</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <Label id="label1" layoutConstraint="colSpan:2">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">娉細姘村垎鎵ｉ噸涓嶈鍏ョ粨绠楅噸閲�</Property>
- </Label>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">deHandle</Property>
- <Property name="property">deHandle</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">dePack</Property>
- <Property name="property">dePack</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <ClientEvent name="onBlur">deAutoByWeight();</ClientEvent>
- <Property name="name">deOther</Property>
- <Property name="property">deOther</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">settleWeight</Property>
- <Property name="property">settleWeight</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">fullWeightTime</Property>
- <Property name="property">fullWeightTime</Property>
- <Property name="labelWidth">120</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Property name="labelWidth">120</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
- <Buttons/>
- <Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remarks</Property>
- <Property name="property">remarks</Property>
- <Property name="editorType">TextArea</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- </Children>
- </FieldSet>
- </Container>
- </ControlTab>
- <ControlTab id="tabCheck">
- <Property name="caption">鎵︽牱鍖栭獙</Property>
- <Property name="iconClass">fa fa-gavel</Property>
- <Property name="width">150</Property>
- <Property name="name">tabCheck</Property>
- <Container layout="padding:10">
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelWidth">100</Property>
- <Property name="labelSeparator">锛�</Property>
- <AutoFormElement>
- <Property name="name">checkStatus</Property>
- <Property name="property">checkStatus</Property>
- <Property name="label">鍖栭獙缁撴灉</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">depotId</Property>
- <Property name="property">depotId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodVariety</Property>
- <Property name="property">foodVariety</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodLevel</Property>
- <Property name="property">foodLevel</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">foodYear</Property>
- <Property name="property">foodYear</Property>
- <Property name="trigger">yearDropDown</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">checkUser</Property>
- <Property name="property">checkUser</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">price</Property>
- <Property name="property">price</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
- <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
- <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
-var entity = arg.entity;
-var inoutData = view.get("#dsMain.data:#");
-
-if(entity.get("standardId") =="C01"){//姘村垎
- inoutData.set("wet",entity.get("value"));
-}
-
-if(entity.get("standardId") =="C02"){//闆滃織
- inoutData.set("impurity",entity.get("value"));
-}</ClientEvent>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">#.checkItems</Property>
- <Property name="highlightCurrentRow">false</Property>
- <Property name="visible">true</Property>
- <Property name="hideMode">display</Property>
- <RowNumColumn/>
- <DataColumn name="standardName">
- <Property name="property">standardName</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="value">
- <Property name="property">value</Property>
- <Property name="align">center</Property>
- <Editor/>
- </DataColumn>
- <DataColumn name="upperLimit">
- <Property name="property">upperLimit</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="lowerLimit">
- <Property name="property">lowerLimit</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="unit">
- <Property name="property">unit</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="remarks">
- <Property name="property">remarks</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </ControlTab>
- </TabControl>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="dialogImg">
- <Property name="width">1000</Property>
- <Property name="height">95%</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">娴佺▼杩芥函灞曠ず</Property>
- <Buttons/>
- <Children>
- <IFrame id="iFrameImg">
- <Property name="width">100%</Property>
- </IFrame>
- </Children>
- <Tools/>
- </Dialog>
- <Dialog id="dialogAbnormal" layout="regionPadding:5">
- <Property name="width">450</Property>
- <Property name="iconClass">fa fa-tasks</Property>
- <Property name="caption">寮傚父鎿嶄綔鍘熷洜</Property>
- <Property name="closeable">false</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">del();</ClientEvent>
- <Property name="caption">纭畾鍒犻櫎</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">todoError();</ClientEvent>
- <Property name="caption">寮傚父缁堟</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- <Property name="hideMode">visibility</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").close();</ClientEvent>
- <Property name="caption">鍙栨秷鎿嶄綔</Property>
- <Property name="iconClass">fa fa-times</Property>
- </Button>
- </Buttons>
- <Children>
- <TextArea id="textAbnormal">
- <Property name="height">165</Property>
- </TextArea>
- <AutoForm>
- <Property name="cols">*</Property>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">寮傚父缁堟锛氫笟鍔℃暟鎹祦绋嬬粨鏉燂紝閲嶉噺淇℃伅涓嶈繘琛岀粺璁¤绠椼��</Property>
- </Label>
- <Label layoutConstraint="colSpan:1">
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- <Property name="text">鍒犻櫎鎿嶄綔锛氫笟鍔℃暟鎹鍒犻櫎涓斾笉缁熻锛屽彧淇濈暀鏃ュ織璁板綍銆�</Property>
- </Label>
- </AutoForm>
- </Children>
- <Tools/>
- </Dialog>
- <UpdateAction id="uaSave">
- <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxDel">
- <Property name="dataResolver">inoutDataPR#delInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxError">
- <Property name="dataResolver">inoutDataPR#errorInoutData</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <UpdateAction id="ajaxComplete">
- <Property name="dataResolver">inoutDataPR#completeInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佺粨鏉熸祦绋嬩箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxPrint">
- <Property name="service">inoutDataPR#printWeightBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxShipPrint">
- <Property name="service">inoutDataPR#printShipBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPrintCheck">
- <Property name="service">inoutDataPR#printCheckBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
- </AjaxAction>
- <AjaxAction id="ajaxInitAdd">
- <Property name="service">inoutDataPR#initAddData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetCheck">
- <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
- </AjaxAction>
- <Export2ReportAction id="exportExcel">
- <Property name="extension">xls</Property>
- <Property name="template">dataGridMain</Property>
- <Property name="maxSize">3000</Property>
- <Property name="fileName">鍗曟嵁鍒楄〃</Property>
- <Property name="showTitle">true</Property>
- <Property name="titleName">鍗曟嵁鍒楄〃</Property>
- <Property name="dataScope">currentPage</Property>
- </Export2ReportAction>
- <CustomDropDown id="ddCustomer">
- <Property name="minHeight">400</Property>
- <Property name="assignmentMap">customerId=id,customerName=name</Property>
- <Property name="minWidth">500</Property>
- <Property name="autoOpen">true</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsCustomer">
- <Property name="dataProvider">inoutCustomerPR#queryListByKey</Property>
- <Property name="dataType">[dtInoutCustomer]</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">${request.getParameter('type')}</Property>
- </Entity>
- </Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key.value");
-var type = "${request.getParameter('type')}";
-view.get("#dsCustomer").set("parameter",{key:key,type:type}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsCustomer.data:#");
-if(data){
- view.get("#ddCustomer").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsCustomer.data:#");
-if(data){
- view.get("#ddCustomer").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsCustomer</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="id">
- <Property name="property">id</Property>
- <Property name="width">100</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </CustomDropDown>
- <CustomDropDown id="ddFoodOrigin">
- <Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
- <Property name="minWidth">500</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
- <Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key2.value");
-view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
-if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
-if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
- <Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="name">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">name</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="simple">
- <Property name="property">simple</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- <DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
- </DataPilot>
- </Container>
- </CustomDropDown>
- <CustomDropDown id="ddNotice">
- <Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,noticeName=name,customerId=customerId,customerName=customerName</Property>
- <Property name="minWidth">500</Property>
- <Property name="autoOpen">true</Property>
- <Container layout="regionPadding:5">
- <DataSet id="dsNotice">
- <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
- <Property name="parameter">
- <Entity>
- <Property name="type">${request.getParameter('type')}</Property>
- </Entity>
- </Property>
- <Property name="dataType">[dtNoticeIn]</Property>
- </DataSet>
- <Container layout="hbox regionPadding:5">
- <TextEditor id="key3">
- <Property name="blankText"> -- 瀹㈡埛鍚嶇О鎴栫紪鐮� --</Property>
- <Property name="width">200</Property>
- </TextEditor>
- <Button>
- <ClientEvent name="onClick">var key = view.get("#key3.value");
-var type = "${request.getParameter('type')}";
-//var customerId = view.get("#dataGridMain.currentEntity").get("customerId");
-//var depotId = view.get("#dataGridMain.currentEntity").get("depotId");
-//var foodVariety = view.get("#dataGridMain.currentEntity").get("foodVariety");
-//view.get("#dsNotice").set("parameter",{key:key,type:type,customerId:customerId,depotId:depotId,foodVariety:foodVariety}).flushAsync();
-view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
- <Property name="caption">鏌ヨ</Property>
- <Property name="iconClass">fa fa-search</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">var data = view.get("#dsCustomer.data:#");
-if(data){
- view.get("#ddCustomer").close(data.toJSON());
-}</ClientEvent>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="caption">纭畾</Property>
- </Button>
- </Container>
- <DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsNotice.data:#");
-if(data){
- view.get("#ddNotice").close(data.toJSON());
-}</ClientEvent>
- <Property name="dataSet">dsNotice</Property>
- <Property name="readOnly">true</Property>
- <DataColumn>
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="name">customerName</Property>
- </DataColumn>
- <DataColumn name="id">
- <Property name="property">id</Property>
- <Property name="align">center</Property>
- </DataColumn>
- </DataGrid>
- </Container>
- </CustomDropDown>
- <YearDropDown id="yearDropDown"/>
- <Dialog id="dialogSelfPrint">
- <Property name="height">300</Property>
- <Property name="width">400</Property>
- <Property name="caption">鑷畾涔夋墦鍗�</Property>
- <Buttons>
- <Button>
- <ClientEvent name="onClick">var html = view.get("#textAreaPrint.text");
-
-self.get("parent").hide();
-printBill(html);</ClientEvent>
- <Property name="caption">纭畾</Property>
- </Button>
- <Button>
- <ClientEvent name="onClick">self.get("parent").hide();
-</ClientEvent>
- <Property name="caption">鍙栨秷</Property>
- </Button>
- </Buttons>
- <Children>
- <TextArea id="textAreaPrint"/>
- </Children>
- <Tools/>
- </Dialog>
- <Menu id="menuEdit">
- <MenuItem>
- <ClientEvent name="onClick">printBatchWeight();</ClientEvent>
- <Property name="caption">鎵归噺杩囩鍗�</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printBatchCheck();</ClientEvent>
- <Property name="caption">鎵归噺鍖栭獙鍗�</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">view.get("#dialogSelfPrint").show();</ClientEvent>
- <Property name="caption">鑷畾涔夋墦鍗�</Property>
- </MenuItem>
- </Menu>
- </View>
-</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
index e8e3fad..393ca23 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.js
@@ -23,16 +23,9 @@
printCheck = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
- if("OUT" == data.get("type")){
- $alert("鍑哄簱鏁版嵁涓嶆敮鎸佹墦鍗帮紒");
- return;
- }
+
if("DEL" == data.get("recordStatus")){
- $alert("鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return;
- }
- if("ERROR" == data.get("recordStatus")){
- $alert("寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
+ $alert("寮傚父澶勭悊鐨勪俊鎭笉鏀寔鎵撳嵃锛�");
return;
}
view.get("#ajaxPrintCheck").set("parameter",data).execute(function(result){
@@ -40,52 +33,13 @@
});
};
-/**
- * 鎵归噺鎵撳嵃锛屽閫�
- */
-printBatchCheck = function(){
- var datas = view.get("#dataGridMain").get("selection");
- if(datas){
- if(datas.length <= 0){
- $alert("灏氭湭閫夋嫨鏁版嵁锛�");
- return;
- }
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- datas.each(function(data){
- //console.log(data);
- if("DEL" == data.get("recordStatus")){
- $notify("鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return true;
- }
- if("ERROR" == data.get("recordStatus")){
- $notify("寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return true;
- }
- view.get("#ajaxPrintCheck").set("parameter",data).execute(function(result){
- LODOP.NewPage();
- LODOP.ADD_PRINT_HTM(0, 0, "100%","100%", result);
- });
- });
- $notify("寮�濮嬭皟鐢ㄦ墦鍗版満绋嬪簭锛�");
- LODOP.PREVIEW();
- }else{
- $alert("璇峰嬀閫夋暟鎹紒");
- }
-};
-//鎵撳嵃绉伴噸鍗�
+//鎵撳嵃杩囩鍗�
printWeight = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
-
if("DEL" == data.get("recordStatus")){
- $alert("鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return;
- }
- if("ERROR" == data.get("recordStatus")){
- $alert("寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
+ $alert("寮傚父澶勭悊鐨勪俊鎭笉鏀寔鎵撳嵃锛�");
return;
}
if("RECORD" != data.get("progress")){
@@ -106,12 +60,7 @@
printShipWeight = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
-
if("DEL" == data.get("recordStatus")){
- $alert("鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return;
- }
- if("ERROR" == data.get("recordStatus")){
$alert("寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
return;
}
@@ -133,54 +82,6 @@
$notify("寮�濮嬭皟鐢ㄦ墦鍗版満绋嬪簭锛�");
LODOP.PREVIEW();
};
-
-/**
- * 鎵归噺鎵撳嵃锛屽閫�
- */
-printBatchWeight = function(){
- var datas = view.get("#dataGridMain").get("selection");
- if(datas){
- if(datas.length <= 0){
- $alert("灏氭湭閫夋嫨鏁版嵁锛�");
- return;
- }
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- var companyId = datas[0].get("companyId");
- if(companyId && companyId == "5016"){
- //澶ф咕鍖哄畾鍒�
- LODOP.SET_PRINT_PAGESIZE(1,1050,1400, "");
- }else {
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- }
-
- datas.each(function(data){
- //console.log(data);
- if("DEL" == data.get("recordStatus")){
- $notify("鍒犻櫎鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return true;
- }
- if("ERROR" == data.get("recordStatus")){
- $notify("寮傚父缁堟鐨勬暟鎹笉鏀寔鎵撳嵃锛�");
- return true;
- }
- if("RECORD" != data.get("progress")){
- $notify("娴佺▼鏈畬鎴愪笉鏀寔鎵撳嵃锛�");
- return true;
- }
- view.get("#ajaxPrint").set("parameter",data).execute(function(result){
- //console.log(result);
- LODOP.NewPage();
- LODOP.ADD_PRINT_HTM(0, 0, "100%","100%", result);
- });
- });
- $notify("寮�濮嬭皟鐢ㄦ墦鍗版満绋嬪簭锛�");
- LODOP.PREVIEW();
- }else{
- $alert("璇峰嬀閫夋暟鎹紒");
- }
-};
-
//鎵撳嵃缁撶畻鍗�
printPay = function(){
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index 9f75b8f..be037e4 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -4,26 +4,14 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-if(arg.property =="foodVariety"){
- checkByFood(arg.newValue);
-}</ClientEvent>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">绮瀹氫环</Property>
- <Property name="required">false</Property>
- </PropertyDef>
<Reference name="checkItems">
<Property name="parameter">
<Entity>
<Property name="checkId">$${this.checkId}</Property>
<Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
</Entity>
</Property>
- <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
+ <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
</Reference>
</DataType>
@@ -118,9 +106,6 @@
</DataType>
<DataType name="dtCheckItems">
<Property name="creationType">com.ld.igds.check.dto.CheckItemData</Property>
- <PropertyDef name="updateTime">
- <Property name="dataType">Date</Property>
- </PropertyDef>
<PropertyDef name="checkId">
<Property></Property>
<Property name="label">妫�娴嬬紪鐮�</Property>
@@ -165,17 +150,9 @@
<Property name="dataType">Double</Property>
<Property name="label">澧為噸%</Property>
</PropertyDef>
- <PropertyDef name="ruleAddEnd">
- <Property name="dataType">Double</Property>
- <Property name="label">澧為噸涓婇檺%</Property>
- </PropertyDef>
<PropertyDef name="ruleReduce">
<Property name="dataType">Double</Property>
<Property name="label">鎵ｉ噸鍊�%</Property>
- </PropertyDef>
- <PropertyDef name="standardPrice">
- <Property name="dataType">Double</Property>
- <Property name="label">鏍囧噯鍗曚环锛堝厓/鏂わ級</Property>
</PropertyDef>
<PropertyDef name="rulePrice">
<Property name="dataType">Double</Property>
@@ -189,12 +166,34 @@
<Property></Property>
<Property name="label">杩愮畻绗﹀彿</Property>
</PropertyDef>
+ <PropertyDef name="addNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">澧為噸</Property>
+ </PropertyDef>
+ <PropertyDef name="deNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｉ噸</Property>
+ </PropertyDef>
+ <PropertyDef name="addPrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">澧炰环</Property>
+ </PropertyDef>
+ <PropertyDef name="dePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｄ环</Property>
+ </PropertyDef>
+ <PropertyDef name="result">
+ <Property/>
+ <Property name="label">妫�楠岀粨鏋�</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbolValue">
+ <Property/>
+ </PropertyDef>
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
var EDIT = "${request.getParameter('edit')}";
-
var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�

//濡傛灉edit鏈夊�艰〃绀洪殣钘廇DD鍜岀紪杈戞寜閽�
@@ -202,15 +201,6 @@
view.get("#btnEdit").set("visible",false);
view.get("#btnDel").set("visible",false);
view.get("#btn2End").set("visible",false);
-}
-
-//绫诲瀷鍒囨崲
-if("OUT" == TYPE){
- view.get("#dataGridCheckItem").set("visible",false);
- view.get("#deWet").set("label","姘村垎澧為噸");
-}else{
- view.get("#deWet").set("label","姘村垎鎵ｉ噸");
- view.get("#dataGridCheckItem").set("visible",true);
}

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
@@ -256,28 +246,6 @@
view.get("#textAbnormal").set("value",null);
};

-//鍒犻櫎
-del = function(){
- var data = view.get("#dataGridMain.currentEntity");
- if(!data) return;
- 
- var textDel = view.get("#textAbnormal.text");
- if(!textDel){
- $notify("璇峰～鍐欏紓甯稿垹闄ゅ師鍥狅紒");
- return;
- }
- data.set("remarks",textDel);
- view.get("#ajaxDel").execute(function(result){
- if(result){
- $alert(result);
- return;
- }else{
- data.remove();
- view.get("#dialogAbnormal").close();
- }
- });
-};
-
//杩借釜
showImg = function(){
var data = view.get("#dataGridMain.currentEntity");
@@ -289,6 +257,7 @@
view.get("#dialogImg").show();
};

+//寮傚父鎵ц
todoError = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
@@ -304,8 +273,8 @@
$alert(result);
return;
}else{
+ data.remove();
view.get("#dialogAbnormal").close();
- query();
$alert("鎵ц鎴愬姛锛岃嚜鍔ㄥ埛鏂版暟鎹紒");
}
});
@@ -324,6 +293,7 @@
view.get("#btnOK").set("visible",false);
view.get("#dialogMain").show();
};
+
//娴佺▼瀹屾垚-鎵ц
completeExe = function(){
var data = view.get("#dataGridMain.currentEntity");
@@ -346,29 +316,21 @@
});
};

-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dataGridMain.currentEntity");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
- }
- });
-};

-//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
-checkByFood = function(foodVariety){
- if(TYPE == "IN"){
- view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
- if(result){
- var data = view.get("#dsMain.data:#");
- data.set("checkItems",result);
- }
- });
- }
+//鏍规嵁绮鍝佺鑾峰彇绯荤粺閰嶇疆妫�娴嬮」鐩�
+flushCheckList = function(){
+ var data = view.get("#dataGridMain.currentEntity");
+ if (!data.get("foodVariety")) {
+ $alert("娌℃湁閰嶇疆绮鍝佺锛屾棤娉曡幏鍙栬川妫�椤癸紒");
+ return;
+ }
+ view.get("#ajaxGetCheck").set("parameter",{checkId:data.get("checkId"),foodVariety:data.get("foodVariety")}).execute(function(result){
+ if(result){
+ data.set("checkItems",result);
+ }else{
+ $alert("褰撳墠绮鍝佺鏈厤缃川妫�椤癸紝璇疯仈绯荤鐞嗗憳");
+ }
+ });
};
</ClientEvent>
<ClientEvent name="onCreate">
@@ -405,34 +367,13 @@
//姹囨�荤粨鏋�
var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
//鎵ｆ按鏉�
- var deWet = curData.get("deWet"), deImpurity = curData.get("deImpurity");
+ var deWet = 0;

- var impurity = curData.get("impurity"), wet = curData.get("wet");
+ var impurity = 0;


var deBase = 0, multiple = 0;
var checkItems = curData.get("checkItems");
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("wet" == name) {
- var checkItem = this.getCheckItem(checkItems,"C01", "C020101");
- if (checkItem) {
- deBase = Number(wet) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
- 
- //鏉傝川
- if ("impurity" == name) {
- checkItem = this.getCheckItem(recordData.checkItems, "C02","C01010301");
- if (checkItem) {
- deBase = Number(impurity) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));
- deImpurity = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }

/** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
deSum = Number(curData.get("deOther")) + Number(curData.get("deHandle"));
@@ -473,16 +414,10 @@
/** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);

- curData.set("impurity",impurity);
- curData.set("wet",wet);
- curData.set("deImpurity",deImpurity);
- curData.set("deWet",deWet);
- curData.set("deSum",deSum);
curData.set("netWeight",netWeight);
curData.set("settleWeight",settleWeight);
curData.set("recordWeight",recordWeight);
};
-

/**
* 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
@@ -666,7 +601,6 @@
</DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
- <Property name="width">250</Property>
<Property name="name">customerName</Property>
<Property name="align">center</Property>
<Property name="caption">瀹㈡埛鍚嶇О</Property>
@@ -687,40 +621,27 @@
<Property name="property">fullWeight</Property>
<Property name="caption">姣涢噸</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="emptyWeight">
<Property name="property">emptyWeight</Property>
<Property name="caption">鐨噸</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">100</Property>
- </DataColumn>
- <DataColumn id="columnDeSum">
- <Property name="property">deSum</Property>
- <Property name="width">100</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="align">center</Property>
- <Property name="name">deSum</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn name="settleWeight">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">settleWeight</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
</DataColumn>
<DataColumn>
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">recordWeight</Property>
<Property name="align">center</Property>
- <Property name="width">100</Property>
+ <Property name="width">120</Property>
<Property name="visible">true</Property>
<Property name="name">recordWeight</Property>
</DataColumn>
@@ -744,13 +665,13 @@
</DataColumn>
</DataGrid>
</Container>
- <Container layoutConstraint="bottom">
- <Property name="exClassName">bg-color</Property>
- <DataPilot layoutConstraint="right">
+ <ToolBar layoutConstraint="bottom">
+ <Fill/>
+ <DataPilot>
<Property name="itemCodes">pageSize,pages</Property>
<Property name="dataSet">dsMain</Property>
</DataPilot>
- </Container>
+ </ToolBar>
<Dialog id="dialogMain">
<Property name="closeable">false</Property>
<Property name="caption">琛ㄥ崟淇℃伅</Property>
@@ -784,30 +705,25 @@
<Property name="hideMode">display</Property>
<Property name="visible">false</Property>
</Button>
- <Button id="btnAddCheck">
- <ClientEvent name="onClick">var data = view.get("#dataGridMain.currentEntity");
-var list = data.get("checkItems");
-
-list.insert({});
-console.log(list);
-</ClientEvent>
- <Property name="caption">鏂板鍖栭獙椤�</Property>
- <Property name="iconClass">fa fa-plus</Property>
- <Property name="hideMode">display</Property>
- <Property name="visible">true</Property>
- </Button>
<Button>
<ClientEvent name="onClick">cancelMain();</ClientEvent>
<Property name="caption">鍙栨秷鎿嶄綔</Property>
<Property name="iconClass">fa fa-times</Property>
</Button>
+ <Button id="btnFlushCheck" layoutConstraint="left">
+ <ClientEvent name="onClick">flushCheckList();</ClientEvent>
+ <Property name="caption">鑾峰彇璐ㄦ椤�</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-gavel</Property>
+ <Property name="visible">false</Property>
+ </Button>
</Buttons>
<Children>
<TabControl>
<ClientEvent name="onTabChange">if(arg.newTab.get("name") == "tabCheck"){
- view.get("#btnAddCheck").set("visible",true);
+ view.get("#btnFlushCheck").set("visible",true);
}else{
- view.get("#btnAddCheck").set("visible",false);
+ view.get("#btnFlushCheck").set("visible",false);
}</ClientEvent>
<ControlTab>
<Property name="caption">鍩虹淇℃伅</Property>
@@ -889,26 +805,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">specType</Property>
- <Property name="property">specType</Property>
- <Editor>
- <RadioGroup>
- <RadioButton>
- <Property name="text">鏁ｇ伯</Property>
- <Property name="value">鏁ｇ伯</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">25kg</Property>
- <Property name="value">25kg</Property>
- </RadioButton>
- <RadioButton>
- <Property name="text">50kg</Property>
- <Property name="value">50kg</Property>
- </RadioButton>
- </RadioGroup>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -939,7 +835,7 @@
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="cols">*,50,*,50,*,50</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -953,6 +849,17 @@
<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">fullWeightUser</Property>
+ <Property name="property">fullWeightUser</Property>
+ <Property name="label">绉伴噸浜�</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
<ClientEvent name="onBlur">//id 瑙勫垯 d_prop
var id = self.getDom().id;
var prop = id.substring(2,id.length);
@@ -963,50 +870,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
+ <Property name="name">fullWeightTime</Property>
+ <Property name="property">fullWeightTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deImpurity</Property>
- <Property name="property">deImpurity</Property>
- <Property name="showHint">false</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
<Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">impurity</Property>
- <Property name="property">impurity</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement id="deWet">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deWet</Property>
- <Property name="property">deWet</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wet</Property>
- <Property name="property">wet</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<ClientEvent name="onBlur">//id 瑙勫垯 d_prop
@@ -1015,6 +886,7 @@
deAutoByWeight(prop);</ClientEvent>
<Property name="name">deHandle</Property>
<Property name="property">deHandle</Property>
+ <Property name="label">鐜板満鎵ｉ噸</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -1027,8 +899,31 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
+ <Property name="name">deOtherInfo</Property>
+ <Property name="property">deOtherInfo</Property>
+ <Property name="label">鍏朵粬鍘熷洜</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">deCheck</Property>
+ <Property name="property">deCheck</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">addCheck</Property>
+ <Property name="property">addCheck</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ <Property name="text">璇存槑锛氳川妫�澧炴墸閲嶈鏌ョ湅璐ㄦ淇℃伅鏍忎綅璇︾粏</Property>
+ </Label>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
@@ -1039,51 +934,88 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">fullWeightTime</Property>
- <Property name="property">fullWeightTime</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">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>
- <Label layoutConstraint="colSpan:4">
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">80px</Property>
- </Property>
- <Property name="text">璇存槑锛氱粨绠楅噸閲�=鍑�閲�-鎵ｉ噸+澧為噸锛涘叆搴撻噸閲�=鍑�閲�-鎵ｉ噸锛涙墸姘存潅锛氭鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸</Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
<FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
+ <Property name="caption">鍏朵粬闇�瑕佽ˉ鍏呬俊鎭�</Property>
<Buttons/>
<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>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">jjlx</Property>
+ <Property name="property">jjlx</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">绉伴噸鍏ュ簱</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">1</Property>
+ <Property name="text">鏍囧噯鍖呭叆搴�</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzw</Property>
+ <Property name="property">bzw</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">楹昏</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">缂栫粐琚�</Property>
+ <Property name="value">2</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鏁ｈ</Property>
+ <Property name="value">3</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">9</Property>
+ <Property name="text">鍏朵粬</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dbz</Property>
+ <Property name="property">dbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzbjs</Property>
+ <Property name="property">bzbjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dePackage</Property>
+ <Property name="property">dePackage</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">price</Property>
+ <Property name="property">price</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remarks</Property>
<Property name="property">remarks</Property>
<Property name="editorType">TextArea</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -1092,14 +1024,14 @@
</Container>
</ControlTab>
<ControlTab id="tabCheck">
- <Property name="caption">鎵︽牱鍖栭獙</Property>
+ <Property name="caption">璐ㄦ淇℃伅</Property>
<Property name="iconClass">fa fa-gavel</Property>
<Property name="width">150</Property>
<Property name="name">tabCheck</Property>
<Container layout="padding:10">
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -1140,19 +1072,14 @@
<Property name="label">鍖栭獙缁撴灉</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkTime</Property>
+ <Property name="property">checkTime</Property>
+ <Property name="label">璐ㄦ鏃堕棿</Property>
+ <Editor/>
+ </AutoFormElement>
</AutoForm>
<DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
- <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
-var entity = arg.entity;
-var inoutData = view.get("#dsMain.data:#");
-
-if(entity.get("standardId") =="C01"){//姘村垎
- inoutData.set("wet",entity.get("value"));
-}
-
-if(entity.get("standardId") =="C02"){//闆滃織
- inoutData.set("impurity",entity.get("value"));
-}</ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="dataPath">#.checkItems</Property>
<Property name="highlightCurrentRow">false</Property>
@@ -1210,12 +1137,6 @@
<Property name="closeable">false</Property>
<Buttons>
<Button>
- <ClientEvent name="onClick">del();</ClientEvent>
- <Property name="caption">纭畾鍒犻櫎</Property>
- <Property name="iconClass">fa fa-check</Property>
- <Property name="exClassName">btn-warn</Property>
- </Button>
- <Button>
<ClientEvent name="onClick">todoError();</ClientEvent>
<Property name="caption">寮傚父缁堟</Property>
<Property name="iconClass">fa fa-check</Property>
@@ -1258,15 +1179,6 @@
<Property name="validateData">false</Property>
</UpdateItem>
</UpdateAction>
- <UpdateAction id="ajaxDel">
- <Property name="dataResolver">inoutDataPR#delInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹墽琛屽垹闄や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
<UpdateAction id="ajaxError">
<Property name="dataResolver">inoutDataPR#errorInoutData</Property>
<UpdateItem>
@@ -1298,14 +1210,8 @@
<Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
<Property name="async">false</Property>
</AjaxAction>
- <AjaxAction id="ajaxInitAdd">
- <Property name="service">inoutDataPR#initAddData</Property>
- </AjaxAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
<AjaxAction id="ajaxGetCheck">
- <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
+ <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
</AjaxAction>
<Export2ReportAction id="exportExcel">
<Property name="extension">xls</Property>
@@ -1474,24 +1380,12 @@
</MenuItem>
<MenuItem>
<ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">鎵撳嵃妫�楠屽崟</Property>
+ <Property name="caption">鎵撳嵃璐ㄦ鍗�</Property>
<Property name="iconClass">fa fa-print</Property>
</MenuItem>
<MenuItem>
<ClientEvent name="onClick">printPay();</ClientEvent>
<Property name="caption">鎵撳嵃缁撶畻鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- <Property name="disabled">true</Property>
- </MenuItem>
- <Separator/>
- <MenuItem>
- <ClientEvent name="onClick">printBatchWeight();</ClientEvent>
- <Property name="caption">鎵归噺杩囩鍗�</Property>
- <Property name="iconClass">fa fa-print</Property>
- </MenuItem>
- <MenuItem>
- <ClientEvent name="onClick">printBatchCheck();</ClientEvent>
- <Property name="caption">鎵归噺鍖栭獙鍗�</Property>
<Property name="iconClass">fa fa-print</Property>
</MenuItem>
<MenuItem>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
index 205192b..4704b70 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
@@ -19,7 +19,6 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.Expose;
import com.bstek.dorado.data.provider.Page;
-import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.service.HInoutSettleService;
import com.ld.igds.models.InoutSettle;
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/JInoutCheckService.java b/igds-inout/src/main/java/com/ld/igds/m/service/JInoutCheckService.java
index 754f575..8ad3e25 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/JInoutCheckService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/JInoutCheckService.java
@@ -81,7 +81,6 @@
arg.add(ContextUtil.getCompanyId());
arg.add(InoutConstant.TYPE_IN);
- arg.add(InoutConstant.RECORD_STATUS_ERROR);
arg.add(InoutConstant.RECORD_STATUS_DEL);
arg.add(InoutConstant.PROGRESS_RECORD);
diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index c356dfd..c172533 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -156,14 +156,6 @@
<Property></Property>
<Property name="label">杩愯緭鏂瑰紡</Property>
</PropertyDef>
- <PropertyDef name="specType">
- <Property></Property>
- <Property name="label">瑙勬牸</Property>
- </PropertyDef>
- <PropertyDef name="customerId">
- <Property></Property>
- <Property name="label">寰�鏉ュ崟浣岻D</Property>
- </PropertyDef>
<PropertyDef name="customerName">
<Property></Property>
<Property name="label">寰�鏉ュ崟浣�</Property>
@@ -178,26 +170,6 @@
<Property name="label">绮骞翠唤</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="impurity">
- <Property name="dataType">Double</Property>
- <Property name="label">鏉傝川</Property>
- <Property name="displayFormat">0.00 %</Property>
- </PropertyDef>
- <PropertyDef name="wet">
- <Property name="dataType">Double</Property>
- <Property name="label">姘村垎</Property>
- <Property name="displayFormat">0.00 %</Property>
- </PropertyDef>
- <PropertyDef name="deImpurity">
- <Property name="dataType">Double</Property>
- <Property name="label">鏉傝川鎵ｉ噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
- <PropertyDef name="deWet">
- <Property name="dataType">Double</Property>
- <Property name="label">姘村垎澧為噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
<PropertyDef name="deHandle">
<Property name="dataType">Double</Property>
<Property name="label">鍊间粨鎵ｉ噸</Property>
@@ -206,11 +178,6 @@
<PropertyDef name="deOther">
<Property name="dataType">Double</Property>
<Property name="label">鍏朵粬鎵ｉ噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
- <PropertyDef name="deSum">
- <Property name="dataType">Double</Property>
- <Property name="label">鎬绘墸閲�</Property>
<Property name="displayFormat">0.0 KG</Property>
</PropertyDef>
<PropertyDef name="fullWeight">
@@ -271,7 +238,7 @@
</PropertyDef>
<PropertyDef name="completeTime">
<Property name="dataType">DateTime</Property>
- <Property name="label">瀹屾垚鏃堕棿</Property>
+ <Property name="label">绂诲簱鏃堕棿</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="completeUser">
@@ -336,7 +303,7 @@
</PropertyDef>
<PropertyDef name="foodLevel">
<Property></Property>
- <Property name="label">绮绛夌骇</Property>
+ <Property name="label">绮瀹氱瓑</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
<Property name="keyProperty">code</Property>
@@ -345,23 +312,16 @@
</PropertyDef>
<PropertyDef name="checkUser">
<Property></Property>
- <Property name="label">鍖栭獙浜�</Property>
+ <Property name="label">璐ㄦ浜�</Property>
</PropertyDef>
<PropertyDef name="checkId">
<Property></Property>
<Property name="label">鍖栭獙鍗曞彿</Property>
</PropertyDef>
- <PropertyDef name="curStorage">
- <Property name="dataType">double</Property>
- <Property name="label">褰撳墠搴撳瓨</Property>
- </PropertyDef>
<PropertyDef name="price">
<Property name="dataType">double</Property>
- <Property name="label">鍗曚环</Property>
- </PropertyDef>
- <PropertyDef name="settleMoney">
- <Property name="dataType">double</Property>
- <Property name="label">缁撶畻閲戦</Property>
+ <Property name="label">绮瀹氫环</Property>
+ <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
@@ -371,22 +331,73 @@
<Property></Property>
<Property name="label">閫氱煡鍗曠紪鐮�</Property>
</PropertyDef>
- <PropertyDef name="noticeName">
- <Property></Property>
- <Property name="label">閫氱煡鍗�</Property>
- </PropertyDef>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">鍗曚环</Property>
- <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
- </PropertyDef>
- <PropertyDef name="settleTag">
- <Property></Property>
- <Property name="label">鏄惁缁撶畻</Property>
- </PropertyDef>
<PropertyDef name="remarks">
<Property name="label">澶囨敞璇存槑</Property>
</PropertyDef>
+ <PropertyDef name="foodLocationId">
+ <Property></Property>
+ <Property name="label">浜у湴鍚嶇О浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="checkTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璐ㄦ鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleUser">
+ <Property></Property>
+ <Property name="label">鎵︽牱浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎵︽牱鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleType">
+ <Property></Property>
+ <Property name="label">鎵︽牱鏂瑰紡</Property>
+ </PropertyDef>
+ <PropertyDef name="deCheck">
+ <Property name="dataType">double</Property>
+ <Property name="label">璐ㄦ鎵ｉ噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="addCheck">
+ <Property name="dataType">double</Property>
+ <Property name="label">璐ㄦ澧為噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="jjlx">
+ <Property></Property>
+ <Property name="label">妫�鏂ょ被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="dePackage">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍖呰鎵ｉ噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="deOtherInfo">
+ <Property></Property>
+ <Property name="label">鍏朵粬鎵ｉ噸鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="settleId">
+ <Property></Property>
+ <Property name="label">缁撶畻鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="bzw">
+ <Property></Property>
+ <Property name="label">鍖呰鐗�</Property>
+ </PropertyDef>
+ <PropertyDef name="dbz">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞寘閲�</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="bzbjs">
+ <Property name="dataType">int</Property>
+ <Property name="label">鍖呬欢鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+ </PropertyDef>
</DataType>
<DataType name="dtInoutSettle">
<Property name="matchType">com.ld.igds.models.InoutSettle</Property>
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index 387aee5..bfdf1ea 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -83,7 +83,6 @@
<if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
<if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
AND PROGRESS_ != 'RECORD'
- AND RECORD_STATUS_ != 'ERROR'
AND RECORD_STATUS_ != 'DEL'
</where>
</select>
@@ -110,7 +109,6 @@
COMPLETE_TIME_ <![CDATA[ > ]]>#{param.start,jdbcType=TIMESTAMP}
</if>
AND PROGRESS_ = 'RECORD'
- AND RECORD_STATUS_ != 'ERROR'
AND RECORD_STATUS_ != 'DEL'
ORDER BY COMPLETE_TIME_
</where>
@@ -156,7 +154,6 @@
COMPLETE_TIME_ <![CDATA[ < ]]>#{param.end,jdbcType=TIMESTAMP}
</if>
</where>
- AND RECORD_STATUS_ != 'ERROR'
AND RECORD_STATUS_ != 'DEL'
ORDER BY COMPLETE_TIME_ DESC
LIMIT 1
@@ -171,7 +168,7 @@
<if test="param.intelCard != null and param.plateNum != null">
AND ( INTEL_CARD_ = #{param.intelCard} OR PLATE_NUM_ = #{param.plateNum} )
</if>
- and PROGRESS_ <> 'RECORD' and RECORD_STATUS_ != 'DEL' and RECORD_STATUS_ != 'ERROR'
+ and PROGRESS_ <> 'RECORD' and RECORD_STATUS_ != 'DEL'
</where>
</select>
@@ -189,16 +186,16 @@
<update id="inoutStop" parameterType="com.ld.igds.inout.dto.InoutParam">
update D_INOUT_RECORD
<set>
- RECORD_STATUS_ ='ERROR',
PROGRESS_ = 'RECORD',
+ <if test="param.recordStatus != null and param.recordStatus != '' ">RECORD_STATUS_ = #{param.recordStatus},</if>
<if test="param.checkStatus != null and param.checkStatus != '' ">CHECK_STATUS_ = #{param.checkStatus},</if>
<if test="param.msg != null and param.msg != '' ">REMARKS_ = concat(REMARKS_,#{param.msg})</if>
</set>
- <where>
- <if test="param.companyId != null and param.companyId != '' ">COMPANY_ID_ = #{param.companyId}</if>
- <if test="param.id != null and param.id != '' ">AND ID_ = #{param.id}</if>
- </where>
+ <where>
+ COMPANY_ID_ = #{param.companyId},
+ AND ID_ = #{param.id}
+ </where>
</update>
@@ -476,7 +473,6 @@
and TYPE_ = #{param.type}
and COMPANY_ID_ = #{param.companyId}
and RECORD_STATUS_ != 'DEL'
- and RECORD_STATUS_ != 'ERROR'
</update>
<!-- 鏌ヨ娴佺▼鏈畬鎴愮殑娴佹按淇℃伅 -->
@@ -505,7 +501,6 @@
AND RECORD_STATUS_ != 'DEL'
AND PROGRESS_ != 'RECORD'
AND PROGRESS_ != 'PAY'
- AND RECORD_STATUS_ != 'ERROR'
</select>
@@ -517,7 +512,6 @@
where
PROGRESS_ = 'RECORD'
AND RECORD_STATUS_ != 'DEL'
- AND RECORD_STATUS_ != 'ERROR'
<if test="param.type != null and param.type != ''">AND TYPE_ = #{param.type}</if>
<if test="param.companyId != null and param.companyId != ''">AND COMPANY_ID_ = #{param.companyId}</if>
<if test="param.deptId != null and param.deptId != ''">AND DEPT_ID_ = #{param.deptId}</if>
@@ -542,7 +536,6 @@
AND TYPE_ = #{param.type}
AND (PLATE_NUM_ = #{param.plateNum} or INTEL_CARD_ = #{param.intelCard})
AND PROGRESS_ != 'RECORD'
- AND RECORD_STATUS_ != 'ERROR'
AND RECORD_STATUS_ != 'DEL'
<if test="param.start != null">
AND REGISTER_TIME_ <![CDATA[ > ]]> #{param.start,jdbcType=TIMESTAMP}
--
Gitblit v1.9.3