From 1a47d9eef4cfe9385ce66b791de84db54a5ba87c Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期日, 25 六月 2023 20:30:36 +0800
Subject: [PATCH] 出入库流程优化-入库详单优化
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 67 +-
igds-inout/src/main/resources/mapper/InoutRecordMapper.xml | 11
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 1
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml | 1504 +++++++++++++++++++++++++++++++++++++++++++++++
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 75 -
igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java | 4
igds-core/src/main/java/com/ld/igds/view/service/HDicAreaService.java | 40 +
igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java | 7
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 9
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 126 +-
igds-core/src/main/java/com/ld/igds/view/DicAreaPR.java | 12
igds-inout/src/main/java/com/ld/igds/inout/view/InoutDataPR.java | 29
12 files changed, 1,705 insertions(+), 180 deletions(-)
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 7554af0..c8d3262 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,76 +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 companyId, String checkId,
+ String foodVariety) {
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- List<CheckItemData> list = null;
- if (null != checkId)
- list = checkStandardService.getCheckItemById(checkId, companyId);
+ List<CheckItemData> list = null;
+ if (null != checkId)
+ 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(companyId, checkId, foodVariety);
+ }
- public CheckUpdateResult updateCheckItems(String checkId, String companyId,
- List<CheckItemData> checkItems) {
+ return list;
+ }
- CheckUpdateResult result = new CheckUpdateResult();
- if (null == checkItems || checkItems.isEmpty()) {
- return result;
- }
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getCompanyId();
- }
+ public CheckUpdateResult updateCheckItems(String checkId, String companyId,
+ List<CheckItemData> checkItems) {
- for (CheckItemData item : checkItems) {
- if (null == item.getCheckId()) {
- item.setCheckId(checkId);
- }
- item.setCompanyId(companyId);
- if (item.getUpperLimit() == null) {
- item.setUpperLimit(0.0);
- }
+ CheckUpdateResult result = new CheckUpdateResult();
+ if (null == checkItems || checkItems.isEmpty()) {
+ return result;
+ }
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getCompanyId();
+ }
- 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());
- }
+ for (CheckItemData item : checkItems) {
+ if (null == item.getCheckId()) {
+ item.setCheckId(checkId);
+ }
+ item.setCompanyId(companyId);
+ if (item.getUpperLimit() == null) {
+ item.setUpperLimit(0.0);
+ }
- // 鍏堟洿鏂帮紝鏇存柊澶辫触鍒欐柊澧�
- int i = checkStandardService.updateCheckItem(item);
- if (i < 1) {
- checkStandardService.insertCheckItem(item);
- }
- }
- return result;
- }
+ 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;
+ }
}
\ 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 7ae66fd..df6ea4f 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
@@ -78,6 +78,7 @@
* @return
*/
@DataProvider
+ @Expose
public List<CheckItemData> listCheckItemsByParam(Map<String, Object> param) {
String checkId = (String) param.get("checkId");
diff --git a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
index a2af67b..0549d5c 100644
--- a/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
+++ b/igds-core/src/main/java/com/ld/igds/common/impl/CoreDicDataServiceImpl.java
@@ -8,9 +8,9 @@
import com.ld.igds.models.DicArea;
import com.ld.igds.models.DicSlogan;
import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.util.List;
import java.util.Map;
@@ -22,7 +22,7 @@
@Service(CoreDicService.BEAN_ID)
public class CoreDicDataServiceImpl implements CoreDicService {
- @Autowired
+ @Resource
private DicDataMapper dicDataMapper;
@Override
diff --git a/igds-core/src/main/java/com/ld/igds/view/DicAreaPR.java b/igds-core/src/main/java/com/ld/igds/view/DicAreaPR.java
index f418ab3..3b9974c 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DicAreaPR.java
+++ b/igds-core/src/main/java/com/ld/igds/view/DicAreaPR.java
@@ -3,6 +3,7 @@
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
+import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DicArea;
import com.ld.igds.view.service.HDicAreaService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -32,6 +33,17 @@
return areaService.listDicArea(type);
}
+
+ /**
+ * dicAreaPR#pageList
+ * @param key
+ * @return
+ */
+ @DataProvider
+ public void pageList(Page<DicArea> page,String key) throws Exception {
+ areaService.pageList(page,key);
+ }
+
/**
* dicAreaPR#saveDicArea
*
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 1e58093..dbfdeec 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
@@ -1,18 +1,20 @@
package com.ld.igds.view.service;
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
+import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.DicArea;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
+
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Component
-public class HDicAreaService extends HibernateDao{
+public class HDicAreaService extends HibernateDao {
- public List<DicArea> listDicArea(String type){
+ public List<DicArea> listDicArea(String type) {
String hql = " from " + DicArea.class.getName();
Map<String, Object> args = new HashMap<String, Object>();
@@ -47,7 +49,7 @@
return null;
}
- public DicArea listDicAreaByName(String name){
+ public DicArea listDicAreaByName(String name) {
String hql = " from " + DicArea.class.getName() + " where 1=1";
Map<String, Object> args = new HashMap<String, Object>();
@@ -58,14 +60,14 @@
hql += " order by code";
List<DicArea> list = this.query(hql, args);
- if(null ==list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return null;
}
return list.get(0);
}
- public DicArea listDicAreaByCode(String code){
- if(StringUtils.isEmpty(code)){
+ public DicArea listDicAreaByCode(String code) {
+ if (StringUtils.isEmpty(code)) {
return null;
}
String hql = " from " + DicArea.class.getName() + " where code =:code";
@@ -75,9 +77,33 @@
hql += " order by code";
List<DicArea> list = this.query(hql, args);
- if(null ==list || list.isEmpty()){
+ if (null == list || list.isEmpty()) {
return null;
}
return list.get(0);
}
+
+ public void pageList(Page<DicArea> page, String key) throws Exception {
+
+ String hql = " from " + DicArea.class.getName();
+
+ Map<String, Object> args = new HashMap<>();
+ List<DicArea> list;
+ String countHql;
+ if (StringUtils.isNotEmpty(key)) {
+ hql += " where (name like :key1 or simple like:key2)";
+ args.put("key1", "%" + key + "%");
+ args.put("key2", "%" + key.toUpperCase() + "%");
+
+ countHql = "select count(1) " + hql;
+ hql += " order by code";
+
+ this.pagingQuery(page, hql, countHql, args);
+
+ } else {
+ countHql = "select count(1) " + hql;
+ hql += " order by code";
+ this.pagingQuery(page, hql, countHql);
+ }
+ }
}
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 5c201ae..5ed72b9 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
@@ -15,7 +15,6 @@
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.m.service.InoutCommonService;
-import com.ld.igds.models.Depot;
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutPrice;
import com.ld.igds.models.InoutSysConf;
@@ -200,27 +199,23 @@
* @param data
* @return
*/
- private CheckUpdateResult updateCheckItems(InoutData data) {
- CheckUpdateResult result = new CheckUpdateResult();
- if (null == data.getCheckItems())
- return result;
+ private InoutData updateCheckItems(InoutData data) throws Exception {
- try {
- // 鏇存柊妫�楠岄」鏁版嵁
- result = checkStandardManager.updateCheckItems(data.getCheckId(),
- data.getCompanyId(), data.getCheckItems());
+ if (null == data.getCheckItems()) return data;
- // 灏嗗寲楠屾暟鎹瓨鍏ョ紦瀛樹腑
- inoutService.setCheckCache(data);
+ // 鏇存柊妫�楠岄」鏁版嵁
+ CheckUpdateResult checkUpdateResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
- return result;
-
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父锛歿}", e);
- result.setMsg("鎵ц寮傚父锛�" + e.getMessage());
+ if (data.getDeCheck() == 0) {
+ data.setDeCheck(checkUpdateResult.getDeSum());
}
- return result;
+ if (data.getAddCheck() == 0) {
+ data.setAddCheck(checkUpdateResult.getAddSum());
+ }
+
+ return data;
}
+
/**
* 浠庣紦瀛樹腑鑾峰彇涓嬩竴娴佺▼
@@ -470,44 +465,17 @@
return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
}
- // 濡傛灉娴佺▼鏈粨鏉燂紝鍙洿鏂版暟鎹�
- if (!InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
- return inoutService.updateData(data);
- }
- // 濡傛灉鏄凡缁忓畬鎴愮殑鏁版嵁锛屽厛鑾峰彇鍒颁慨鏀圭洿鎺ョ殑鏁版嵁鏍规嵁鏁版嵁杩涜瀵规瘮
- InoutParam param = new InoutParam();
- param.setId(data.getId());
- param.setCompanyId(data.getCompanyId());
- param.setType(data.getType());
- InoutData record = inoutService.inoutQueryById(param);
-
- if (null == record) {
- return "褰撳墠淇敼鏁版嵁宸茬粡涓嶅瓨鍦紒";
- }
-
- // 閬垮厤鏁版嵁搴撲腑鐨勬暟鎹凡缁忚鍏朵粬浜轰慨鏀�
- if (InoutConstant.RECORD_STATUS_DEL.equals(record.getRecordStatus())) {
- return "绯荤粺锛氬凡缁忓垹闄ょ殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
+ if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
+ return "绯荤粺锛氭祦绋嬪凡缁忕粨鏉熺殑鏁版嵁涓嶆敮鎸佷慨鏀癸紒";
}
// 淇濆瓨妫�娴嬮」鐩�
if (InoutConstant.TYPE_IN.equals(data.getType())) {
- // 鍏堟墽琛屽寲楠屼俊鎭繚瀛�
- CheckUpdateResult checkResult = checkStandardManager
- .updateCheckItems(data.getCheckId(), data.getCompanyId(),
- data.getCheckItems());
- if (null != checkResult) {
- // if (null == data.getWet())
- // data.setWet(checkResult.getWet());
- // if (null == data.getImpurity())
- // data.setImpurity(checkResult.getImpurity());
- }
+ data = updateCheckItems(data);
}
-
- // 鏇存柊鏁版嵁
- inoutService.updateData(data);
- return null;
+
+ return inoutService.updateData(data);
}
@@ -666,13 +634,7 @@
data = updateBasicInfo(data, curProgress, nextProgress);
// 鍏ュ簱绉伴噸鍙兘璋冩暣璐ㄦ鍗�
- CheckUpdateResult checkUpdateResult = updateCheckItems(data);
- if (data.getDeCheck() == 0) {
- data.setDeCheck(checkUpdateResult.getDeSum());
- }
- if (data.getAddCheck() == 0) {
- data.setAddCheck(checkUpdateResult.getAddSum());
- }
+ data = updateCheckItems(data);
// 鎵ц鏁版嵁鏇存柊
String msg = inoutService.updateData(data);
@@ -858,7 +820,6 @@
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
"褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
}
-
// 鏇存柊鍖栭獙椤逛俊鎭�
CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems());
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 eeec666..ed3e4e3 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
@@ -237,6 +237,10 @@
if (null != param.getUserId()) {
param.setUserId("%" + param.getUserId() + "%");
}
+
+ if(null != param.getRecordStatus() && InoutConstant.RECORD_STATUS_NORMAL.equals(param.getRecordStatus())){
+ param.setRecordStatus(null);
+ }
List<InoutData> records = inoutMapper.pageRecordData(page, param);
//鍒ゆ柇鍏ュ簱閲嶉噺鏄惁涓虹┖锛屼负绌哄垯璧嬪�肩粨绠楅噸閲�
@@ -712,7 +716,7 @@
data.setCompanyId(ContextUtil.subDeptId(null));
}
- int num = inoutCheckMapper.updateSampleData(data);
+ inoutCheckMapper.updateSampleData(data);
return null;
}
@@ -745,7 +749,8 @@
@Override
public String updateCheckData(InoutData data) {
data.setUpdateTime(new Date());
- int num = inoutCheckMapper.updateCheckData(data);
+
+ inoutCheckMapper.updateCheckData(data);
//鏇存柊缂撳瓨
updateInoutCache(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 40bf192..f7e5585 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
@@ -1,5 +1,6 @@
package com.ld.igds.inout.view;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -14,11 +15,14 @@
import com.ld.igds.inout.manager.InoutManager;
import com.ld.igds.inout.manager.InoutReportManager;
import com.ld.igds.inout.service.InoutService;
+import com.ld.igds.models.DicTrigger;
import com.ld.igds.util.ContextUtil;
+
import org.apache.commons.lang.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
/**
* 鍑哄叆搴撹鍗曢〉闈㈢鐞�
@@ -31,12 +35,23 @@
@Component
public class InoutDataPR {
- @Autowired
+ @Resource
private InoutService inoutService;
- @Autowired
+ @Resource
private InoutReportManager inoutReportManager;
- @Autowired
+ @Resource
private InoutManager inoutManager;
+
+
+
+ // ${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}
+ @DataProvider
+ public List<DicTrigger> triggerRecordStatus1() {
+ List<DicTrigger> list = new ArrayList<DicTrigger>();
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_DEL, "浣滃簾鍗�"));
+ list.add(new DicTrigger(InoutConstant.RECORD_STATUS_NORMAL, "姝ｅ父鍗�"));
+ return list;
+ }
/**
* inoutDataPR#pageInoutData
@@ -46,8 +61,7 @@
* @throws Exception
*/
@DataProvider
- public void pageInoutData(Page<InoutData> page, InoutParam param)
- throws Exception {
+ public void pageInoutData(Page<InoutData> page, InoutParam param) throws Exception {
// 璋冪敤鏍稿績鍖呬腑鏂规硶锛岄渶瑕佸仛瀵硅薄杞崲
param.setPage(page.getPageNo());
param.setLimit(page.getPageSize());
@@ -165,7 +179,6 @@
@Expose
public InoutData initAddData(String type) {
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
@@ -187,9 +200,7 @@
*/
@DataProvider
public InoutData initDataByHand(String type) {
-
IUser user = ContextUtil.getLoginUser();
-
InoutData data = new InoutData();
data.setCompanyId(user.getCompanyId());
data.setRegisterTime(new Date());
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 be037e4..29a11fe 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
@@ -56,9 +56,9 @@
</PropertyDef>
<PropertyDef name="recordStatus">
<Property></Property>
- <Property name="label">鏁版嵁鐘舵��</Property>
+ <Property name="label">鍗曟嵁鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -183,11 +183,11 @@
<Property name="label">鎵ｄ环</Property>
</PropertyDef>
<PropertyDef name="result">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠岀粨鏋�</Property>
</PropertyDef>
<PropertyDef name="operaSymbolValue">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
</Model>
@@ -206,6 +206,7 @@
//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
type:TYPE,
+ recordStatus:'NORMAL',
deptId:deptId
});

@@ -522,15 +523,6 @@
</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>
@@ -546,6 +538,11 @@
<Property name="name">orderTag</Property>
<Property name="property">orderTag</Property>
<Property name="trigger">autoMappingDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">recordStatus</Property>
+ <Property name="property">recordStatus</Property>
<Editor/>
</AutoFormElement>
<Container layout="hbox regionPadding:15">
@@ -712,7 +709,7 @@
</Button>
<Button id="btnFlushCheck" layoutConstraint="left">
<ClientEvent name="onClick">flushCheckList();</ClientEvent>
- <Property name="caption">鑾峰彇璐ㄦ椤�</Property>
+ <Property name="caption">閲嶆柊鑾峰彇璐ㄦ椤�</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-gavel</Property>
<Property name="visible">false</Property>
@@ -823,7 +820,7 @@
<AutoFormElement>
<Property name="name">foodLocation</Property>
<Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="trigger">ddDicArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -1222,53 +1219,53 @@
<Property name="titleName">鍗曟嵁鍒楄〃</Property>
<Property name="dataScope">currentPage</Property>
</Export2ReportAction>
- <CustomDropDown id="ddFoodOrigin">
+ <CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
<Property name="minWidth">500</Property>
+ <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
<Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider"></Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
+ <DataSet id="dsDicArea">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
<Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="pageSize">1000</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="blankText"> -鍚嶇О鎴栫畝鎷硷紝鍖椾含甯� bjs -</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>
+view.get("#dsDicArea").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:#");
+ <ClientEvent name="onClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").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:#");
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").close(data.toJSON());
}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</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="code">
+ <Property name="property">code</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -1279,13 +1276,13 @@
</DataColumn>
</DataGrid>
<DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
</DataPilot>
</Container>
</CustomDropDown>
<CustomDropDown id="ddNotice">
<Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
<Property name="minWidth">500</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
new file mode 100644
index 0000000..9f75b8f
--- /dev/null
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList202306.view.xml
@@ -0,0 +1,1504 @@
+<?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="standardValue">
+ <Property></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>
+ <PropertyDef name="ruleNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｉ噸绯绘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleAdd">
+ <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>
+ <Property name="label">鎵ｈ垂绯绘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleReducePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｈ垂</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbol">
+ <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("#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);
+}
+
+//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
+view.get("#dsQuery").insert({
+ type:TYPE,
+ deptId:deptId
+});
+
+//鏌ヨ
+query = function(){
+ var data = view.get("#dsQuery.data");
+ view.get("#dsMain").set("parameter",data).flushAsync();
+};
+query();
+
+
+//缂栬緫锛屽彧鏈夋祦绋嬬粨鏉熺殑鎵嶅彲浠ヤ慨鏀�
+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">
+/**
+ * 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
+ * 
+ * 1.鍑�閲� = 姣涢噸 - 鐨噸
+ * 2.鎬绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 + 鎵ｆ按鏉傝川
+ * 3.缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛�
+ * 4.鍑�/鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
+ * 
+ * 5.鍏ュ簱鏃讹細鎵ｆ按鏉� 姝ｆ暟 = 鎵ｉ噸锛岃礋鏁� = 澧為噸
+ * 6.鍑哄簱鏃讹細姘村垎澧為噸锛屾鏁�=澧為噸锛岃礋鏁�=鎵ｉ噸
+ */
+deAutoByWeight = function(name){
+ 
+ if(null == name) name = "1";
+ 
+ var curData = view.get("#dsMain.data:#");
+ var fullWeight = curData.get("fullWeight");
+ var emptyWeight = curData.get("emptyWeight");
+ 
+ if(fullWeight == 0 || emptyWeight == 0){
+ return;
+ }
+ // 鍑�閲�
+ var netWeight = Number(fullWeight) - Number(emptyWeight);
+ 
+ if (netWeight <= 0){
+ $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
+ return;
+ }
+ 
+ //姹囨�荤粨鏋�
+ var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
+ //鎵ｆ按鏉�
+ var deWet = curData.get("deWet"), deImpurity = curData.get("deImpurity");
+ 
+ var impurity = curData.get("impurity"), wet = curData.get("wet");
+ 
+ 
+ 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"));
+ 
+ //鍑哄簱
+ if ("OUT" == curData.get("type")) {
+ if (Number(deWet) > 0) {//澧為噸
+ addSum = addSum + Number(deWet);
+ } else {
+ deSum = deSum + Number(deWet);
+ }
+
+ if (Number(deImpurity) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deImpurity);
+ } else {
+ addSum = addSum + Number(deImpurity);
+ }
+ }else{
+ if (Number(deWet) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deWet);
+ } else {
+ addSum = addSum + Number(deWet);
+ }
+ if (Number(deImpurity) > 0) {//鎵ｉ噸
+ deSum = deSum + Number(deImpurity);
+ } else {
+ addSum = addSum + Number(deImpurity);
+ }
+ }
+ 
+ deSum = deSum.toFixed(0);
+ /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
+ addSum = Math.abs(addSum).toFixed(0);
+ 
+ /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
+ recordWeight = Number(netWeight) - Number(deSum);
+ 
+ /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
+ 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);
+};
+
+
+/**
+ * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
+ * @param checkItems
+ * @param code1 绯荤粺鍙傛暟ID
+ * @param code2 鍥芥爣鍙傛暟ID
+ * @returns {undefined}
+ */
+function getCheckItem(checkItems, code1, code2) {
+ if (!checkItems) return null;
+ $.each(checkItems, function (index, checkItem) {
+ if (checkItem.get("standardId") == code1 || checkItem.get("standardId") == code2) {
+ if (checkItem.get("ruleNum") && checkItem.get("upperLimit") > 0.0) {
+ return checkItem;
+ }
+ }
+ });
+ return null;
+}</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="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">
+ <Property name="caption">鍗曟嵁鎵撳嵃</Property>
+ <Property name="exClassName">btn-warm</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ <Property name="menu">menuEdit</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>
+ </Container>
+ <AutoForm layoutConstraint="top">
+ <Property name="cols">*,*,*,*</Property>
+ <Property name="dataSet">dsQuery</Property>
+ <Property name="exClassName">bg-color</Property>
+ <Property name="labelAlign">right</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">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>
+ <Property name="property">userName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">120</Property>
+ <Property name="name">userName</Property>
+ </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>
+ </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 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">100</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="visible">true</Property>
+ <Property name="name">recordWeight</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="label">瀹㈡埛鍚嶇О</Property>
+ <Property name="property">customerName</Property>
+ <Property name="editable">false</Property>
+ <Property name="trigger">ddNotice</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">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">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/>
+ </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>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ </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">//id 瑙勫垯 d_prop
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
+ <Property name="name">emptyWeight</Property>
+ <Property name="property">emptyWeight</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);
+deAutoByWeight(prop);
+ </ClientEvent>
+ <Property name="name">fullWeight</Property>
+ <Property name="property">fullWeight</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
+ <Property name="readOnly">true</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <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>
+ <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
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
+ <Property name="name">deHandle</Property>
+ <Property name="property">deHandle</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);
+deAutoByWeight(prop);</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">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>
+ <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>
+ <Property name="showLabel">false</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">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>
+ <AutoFormElement>
+ <Property name="name">checkStatus</Property>
+ <Property name="property">checkStatus</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>
+ <Property name="visible">true</Property>
+ <Property name="hideMode">display</Property>
+ <RowNumColumn/>
+ <DataColumn name="standardName">
+ <Property name="property">standardName</Property>
+ <Property name="align">center</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="value">
+ <Property name="property">value</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">妫�娴嬪�硷紙鍙紪杈戯級</Property>
+ <Editor/>
+ </DataColumn>
+ <DataColumn name="unit">
+ <Property name="property">unit</Property>
+ <Property name="width">80</Property>
+ <Property name="readOnly">true</Property>
+ </DataColumn>
+ <DataColumn name="standardValue">
+ <Property name="property">standardValue</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="remarks">
+ <Property name="property">remarks</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="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"></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,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">[dtNoticeDto]</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')}";
+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("#dsNotice.data:#");
+if(data){
+ view.get("#ddNotice").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>
+ <Property name="property">customerName</Property>
+ <Property name="align">center</Property>
+ <Property name="name">customerName</Property>
+ </DataColumn>
+ <DataColumn name="name">
+ <Property name="property">name</Property>
+ </DataColumn>
+ </DataGrid>
+ </Container>
+ </CustomDropDown>
+ <YearDropDown id="yearDropDown"/>
+ <Dialog id="dialogSelfPrint">
+ <Property name="height">300</Property>
+ <Property name="width">600</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">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="iconClass">fa fa-print</Property>
+ </MenuItem>
+ <MenuItem>
+ <ClientEvent name="onClick">printCheck();</ClientEvent>
+ <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>
+ <ClientEvent name="onClick">view.get("#dialogSelfPrint").show();</ClientEvent>
+ <Property name="caption">鑷畾涔夋墦鍗�</Property>
+ <Property name="iconClass">fa fa-print</Property>
+ </MenuItem>
+ </Menu>
+ </View>
+</ViewConfig>
diff --git a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
index e75cb97..cd2312f 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java
@@ -276,7 +276,7 @@
}
hql += " where companyId =:companyId and deptId =:deptId";
- Map<String, Object> args = new HashMap<String, Object>();
+ Map<String, Object> args = new HashMap<>();
args.put("companyId", ContextUtil.getCompanyId());
args.put("deptId", ContextUtil.subDeptId(null));
@@ -302,11 +302,10 @@
str = (String) parameter.get("key");
if (StringUtils.isNoneEmpty(str)) {
- hql += " and (customerId like:customerId or customerName like:customerName) ";
- args.put("customerId", "%" + str + "%");
+ hql += " and (name like:name or customerName like:customerName) ";
+ args.put("name", "%" + str + "%");
args.put("customerName", "%" + str + "%");
}
-
hql += " order by id ";
diff --git a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
index bfdf1ea..36bb4a0 100644
--- a/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutRecordMapper.xml
@@ -447,7 +447,16 @@
<if test="param.checkStatus != null and param.checkStatus == 'NONE' ">AND CHECK_STATUS_ = 'NONE'</if>
</where>
- AND RECORD_STATUS_ != 'DEL'
+
+ <choose>
+ <when test="param.recordStatus != null and param.recordStatus == 'DEL' ">
+ AND RECORD_STATUS_ = 'DEL'
+ </when>
+ <otherwise>
+ AND RECORD_STATUS_ != 'DEL'
+ </otherwise>
+ </choose>
+
<choose>
<when test="param.orderTag != null and param.orderTag == 'ASC' ">
--
Gitblit v1.9.3