From 419e76f6256868851ed245940297f7f5bfd99e55 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 01 六月 2023 17:54:45 +0800
Subject: [PATCH] 化验页面优化1
---
igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml | 65 +--
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 198 +++++++--
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 56 +-
igds-core/src/main/java/com/ld/igds/check/service/impl/CoreCheckStandardServiceImpl.java | 45 -
igds-web/src/main/resources/static/admin/inout/in-sample.js | 29 -
igds-web/src/main/resources/templates/admin/inout/in-check.html | 247 ++++--------
igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java | 23 +
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 68 +++
igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java | 3
igds-core/src/main/java/com/ld/igds/models/CheckStandard.java | 16
igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java | 40 ++
igds-web/src/main/resources/templates/admin/inout/in-sample.html | 29 -
igds-core/src/main/java/com/ld/igds/check/CheckStandardPR.java | 4
igds-web/src/main/resources/static/admin/inout/in-check.js | 131 ++++--
igds-core/src/main/java/com/ld/igds/models/CheckItem.java | 2
igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java | 12
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java | 11
igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java | 2
igds-core/src/main/resources/mapper/CheckStandardMapper.xml | 28
igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java | 18
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 92 +++-
igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java | 9
igds-core/src/main/java/com/ld/igds/check/service/CoreCheckStandardService.java | 11
23 files changed, 643 insertions(+), 496 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
index 9423b6f..b152e22 100644
--- a/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/check/CheckStandard.view.xml
@@ -8,15 +8,10 @@
<PropertyDef name="id">
<Property></Property>
<Property name="label">id</Property>
- <Property name="required">false</Property>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- <Property name="label">閮ㄩ棬缂栫爜</Property>
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
@@ -33,40 +28,27 @@
<Property name="label">鍖栭獙椤圭紪鐮�</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="operaSymbol">
- <Property></Property>
- <Property name="label">鏍囧噯瑕佹眰</Property>
- <Property name="mapping">
- <Property name="mapValues"></Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="unit">
- <Property></Property>
- <Property name="label">鍗曚綅</Property>
- <Property name="required">false</Property>
- </PropertyDef>
<PropertyDef name="standardName">
<Property></Property>
<Property name="label">鍖栭獙椤�</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbol">
+ <Property></Property>
+ <Property name="label">鏍囧噯瑕佹眰</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="upperLimit">
<Property name="dataType">Double</Property>
<Property name="label">鍚堟牸浼愬��</Property>
</PropertyDef>
+ <PropertyDef name="unit">
+ <Property></Property>
+ <Property name="label">鍗曚綅</Property>
+ </PropertyDef>
<PropertyDef name="ruleNum">
<Property></Property>
- <Property name="label">鎵ｉ噸绯绘暟</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="ruleAdd">
- <Property></Property>
- <Property name="label">澧為噸%</Property>
- <Property name="dataType">Double</Property>
- </PropertyDef>
- <PropertyDef name="ruleAddEnd">
- <Property></Property>
- <Property name="label">澧為噸涓婇檺%</Property>
+ <Property name="label">澧炴墸閲嶇郴鏁�</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="ruleReduce">
@@ -74,8 +56,14 @@
<Property name="label">鎵ｉ噸姣斾緥</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
- <PropertyDef name="standardPrice">
- <Property name="label">鏍囧噯鍗曚环(鍏�/鏂�)</Property>
+ <PropertyDef name="ruleAdd">
+ <Property></Property>
+ <Property name="label">澧為噸姣斾緥</Property>
+ <Property name="dataType">Double</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleAddEnd">
+ <Property></Property>
+ <Property name="label">澧為噸涓婇檺%</Property>
<Property name="dataType">Double</Property>
</PropertyDef>
<PropertyDef name="rulePrice">
@@ -312,11 +300,11 @@
<Property name="cols">*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
- <Property name="labelWidth">120</Property>
+ <Property name="labelWidth">140</Property>
<AutoFormElement>
<Property name="name">ruleNum</Property>
<Property name="property">ruleNum</Property>
- <Property name="label">姣忛珮鍑烘爣鍑�</Property>
+ <Property name="label">姣忛珮鍑哄灏�</Property>
<Property name="labelAlign">right</Property>
<Editor/>
</AutoFormElement>
@@ -324,7 +312,7 @@
<Property name="name">ruleReduce</Property>
<Property name="property">ruleReduce</Property>
<Property name="labelAlign">right</Property>
- <Property name="label">鎵ｉ噸锛�%锛�</Property>
+ <Property name="label">鎵ｉ噸姣斾緥锛�%锛�</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -340,17 +328,6 @@
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">140</Property>
- <AutoFormElement>
- <Property name="name">standardPrice</Property>
- <Property name="property">standardPrice</Property>
- <Editor/>
- </AutoFormElement>
- <Label>
- <Property name="text">娉ㄦ剰锛氱郴绲变粎浠ユ按鍒嗘爣鍑嗕环鏍间负鍑嗐��</Property>
- <Property name="style">
- <Property name="color">blue</Property>
- </Property>
- </Label>
<AutoFormElement>
<Property name="name">rulePrice</Property>
<Property name="property">rulePrice</Property>
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 f5611ec..c39d885 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
@@ -30,23 +30,18 @@
*
* @param checkId
* @param companyId
- * @param deptId
* @param foodVariety
* @return
*/
- public List<CheckItemData> listCheckItem(String checkId, String companyId,
- String deptId, String foodVariety) {
+ public List<CheckItemData> listCheckItem(String checkId, String companyId, String foodVariety) {
if (StringUtils.isEmpty(companyId)) {
companyId = ContextUtil.getCompanyId();
- }
- if (StringUtils.isEmpty(deptId)) {
- deptId = ContextUtil.subDeptId(ContextUtil.getLoginUser());
}
List<CheckItemData> list = checkStandardService.getCheckItemById(checkId, companyId);
if (list == null || list.isEmpty()) {
- list = checkStandardService.getCheckItemByStandard(checkId, companyId, deptId, foodVariety);
+ list = checkStandardService.getCheckItemByStandard(checkId, companyId, foodVariety);
}
return list;
}
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 e1df4fd..b299a6f 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
@@ -84,7 +84,7 @@
String deptId = (String) param.get("deptId");
String foodVariety = (String) param.get("foodVariety");
- return checkStandardManager.listCheckItem(checkId, null, deptId, foodVariety);
+ return checkStandardManager.listCheckItem(checkId, deptId, foodVariety);
}
/**
@@ -101,7 +101,7 @@
String deptId = (String) param.get("deptId");
String foodVariety = (String) param.get("foodVariety");
- return checkStandardManager.listCheckItem(null, null, deptId, foodVariety);
+ return checkStandardManager.listCheckItem(null, null, foodVariety);
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java b/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
index cfc0a61..bafa3a7 100644
--- a/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
+++ b/igds-core/src/main/java/com/ld/igds/check/dto/CheckItemData.java
@@ -16,7 +16,8 @@
*/
@Data
@EqualsAndHashCode(callSuper=false)
-public class CheckItemData extends CheckItem implements Serializable {/**
+public class CheckItemData extends CheckItem implements Serializable {
+ /**
*
*/
private static final long serialVersionUID = -570067528303737321L;
diff --git a/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java b/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
index 58d7b46..8d4e4f2 100644
--- a/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
+++ b/igds-core/src/main/java/com/ld/igds/check/mapper/CheckStandardMapper.java
@@ -45,12 +45,10 @@
* 鑾峰彇閰嶇疆鐨勫寲楠岄」淇℃伅
*
* @param companyId
- * @param deptId
* @param foodVariety
* @return
*/
List<CheckStandardData> getCheckStandard(@Param("companyId") String companyId,
- @Param("deptId") String deptId,
@Param("foodVariety") String 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 0e8c235..bd90724 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
@@ -51,14 +51,5 @@
*
* @param checkId
*/
- List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String deptId, String foodVariety);
-
- /**
- * 鑾峰彇鏍囧噯鐨勫寲楠屽畾涔夛紝鏂板鍖栭獙椤圭洰
- *
- * @param companyId
- * @return
- */
- List<CheckStandardData> getCheckStandard(String companyId, String deptId, String foodVariety);
-
+ List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety);
}
diff --git a/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java b/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
index c7af9a8..b7bd945 100644
--- a/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
+++ b/igds-core/src/main/java/com/ld/igds/check/service/HCheckStandardService.java
@@ -21,14 +21,6 @@
Map<String, Object> args = new HashMap<String, Object>();
args.put("companyId", ContextUtil.getCompanyId());
- if(param != null){
- String str = (String) param.get("deptId");
- if (StringUtils.isEmpty(str)) {
- str = ContextUtil.subDeptId(ContextUtil.getLoginUser());
- }
- hql += " and deptId =:deptId ";
- args.put("deptId", str);
- }
hql += " order by foodVariety";
@@ -44,10 +36,6 @@
if(null == data.getId()){
data.setId(ContextUtil.getTimeId());
}
-// TODO
-// if(null == data.getDeptId()){
-// data.setDeptId(ContextUtil.subDeptId(ContextUtil.getLoginUser()));
-// }
if(null == data.getUpperLimit()) data.setUpperLimit(0.0);
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 16a2de4..9bf2c66 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
@@ -6,6 +6,7 @@
import com.ld.igds.check.service.CoreCheckStandardService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
@@ -42,14 +43,16 @@
}
@Override
- public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId,
- String deptId, String foodVariety) {
+ public List<CheckItemData> getCheckItemByStandard(String checkId, String companyId, String foodVariety) {
List<CheckItemData> result = new ArrayList<>();
if (StringUtils.isEmpty(foodVariety)) {
return result;
}
- List<CheckStandardData> list = this.getCheckStandard(companyId, deptId, foodVariety);
+ if (StringUtils.isEmpty(companyId)) {
+ companyId = ContextUtil.getDefaultCompanyId();
+ }
+ List<CheckStandardData> list = checkStandardMapper.getCheckStandard(companyId, foodVariety);
if (null == list) {
return result;
}
@@ -57,40 +60,16 @@
CheckItemData item;
for (CheckStandardData data : list) {
item = new CheckItemData();
+
+ BeanUtils.copyProperties(data, item);
item.setCheckId(checkId);
- item.setCompanyId(companyId);
- item.setStandardId(data.getStandardId());
- item.setStandardName(data.getStandardName());
- item.setUnit(data.getUnit());
- item.setUpperLimit(data.getUpperLimit());
- item.setRuleNum(data.getRuleNum());
- item.setRuleAdd(data.getRuleAdd());
- item.setRuleAddEnd(data.getRuleAddEnd());
- item.setRuleReduce(data.getRuleReduce());
- item.setOperaSymbol(data.getOperaSymbol());
-// TODO
-// if (data.getUpperLimit() > 0.0) {
-// item.setStandardValue(data.getUpperLimit() + "");
-// if(null != data.getOperaSymbol()){
-// item.setStandardValue(data.getOperaSymbol() +" " + data.getUpperLimit());
-// }
-// }
+
+ if (data.getUpperLimit() > 0.0 && StringUtils.isNotEmpty(data.getOperaSymbol())) {
+ item.setOperaSymbol(data.getOperaSymbol() + " " + data.getUpperLimit());
+ }
result.add(item);
}
return result;
}
-
- @Override
- public List<CheckStandardData> getCheckStandard(String companyId, String deptId, String foodVariety) {
- if (StringUtils.isEmpty(companyId)) {
- companyId = ContextUtil.getDefaultCompanyId();
- }
- if (StringUtils.isEmpty(deptId)) {
- companyId = ContextUtil.subDeptId(ContextUtil.getLoginUser());
- }
-
- return checkStandardMapper.getCheckStandard(companyId, deptId, foodVariety);
- }
-
}
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
index ebd14b6..a77405c 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckItem.java
@@ -101,7 +101,7 @@
private Double addPrice;
@Column(name = "DE_PRICE_")
- @PropertyDef(label = "鎵ｉ噸", description = "鍗曚綅锛氬厓")
+ @PropertyDef(label = "鎵ｄ环", description = "鍗曚綅锛氬厓")
private Double dePrice;
@Column(name = "RESULT_", length = 2)
diff --git a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
index 5469a0c..6fddff1 100644
--- a/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
+++ b/igds-core/src/main/java/com/ld/igds/models/CheckStandard.java
@@ -56,31 +56,31 @@
private String operaSymbol;
@Column(name = "UPPER_LIMIT_")
- @PropertyDef(label = "鏍囧噯涓婇檺")
+ @PropertyDef(label = "鏍囧噯鍊�")
private Double upperLimit;
@Column(name = "RULE_NUM_")
- @PropertyDef(label = "鎵ｉ噸绯绘暟")
+ @PropertyDef(label = "澧炴墸閲嶇郴鏁�")
private Double ruleNum;
+ @Column(name = "RULE_REDUCE_")
+ @PropertyDef(label = "鎵ｉ噸姣斾緥")
+ private Double ruleReduce;
+
@Column(name = "RULE_ADD_")
- @PropertyDef(label = "澧為噸%")
+ @PropertyDef(label = "澧為噸姣斾緥")
private Double ruleAdd;
@Column(name = "RULE_ADD_END_")
@PropertyDef(label = "澧為噸涓婇檺%")
private Double ruleAddEnd;
- @Column(name = "RULE_REDUCE_")
- @PropertyDef(label = "鎵ｉ噸%")
- private Double ruleReduce;
-
@Column(name = "RULE_PRICE_")
@PropertyDef(label = "鎵ｈ垂绯绘暟")
private Double rulePrice;
@Column(name = "RULE_REDUCE_PRICE_")
- @PropertyDef(label = "鎵ｈ垂")
+ @PropertyDef(label = "鎵ｈ垂姣斾緥")
private Double ruleReducePrice;
@Column(name = "UPDATE_TIME_")
diff --git a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
index 56676d5..9916454 100644
--- a/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
+++ b/igds-core/src/main/resources/mapper/CheckStandardMapper.xml
@@ -93,18 +93,20 @@
STANDARD_NAME_ as standardName,
UNIT_ as unit,
UPPER_LIMIT_ as upperLimit,
--- LOWER_LIMIT_ as lowerLimit,
+ OPERA_SYMBOL_ as operaSymbol,
RULE_NUM_ as ruleNum,
RULE_ADD_ as ruleAdd,
RULE_ADD_END_ as ruleAddEnd,
RULE_REDUCE_ as ruleReduce,
- STANDARD_VALUE_ as standardValue,
VALUE_ as value,
- STANDARD_PRICE_ as standardPrice,
RULE_PRICE_ as rulePrice,
RULE_REDUCE_PRICE_ as ruleReducePrice,
- REMARKS_ as remarks,
- OPERA_SYMBOL_ as operaSymbol
+ ADD_NUM_ as addNum,
+ DE_NUM_ as deNum,
+ ADD_PRICE_ as addPrice,
+ DE_PRICE_ as dePrice,
+ RESULT_ as result,
+ REMARKS_ as remarks
from
D_CHECK_ITEM
where COMPANY_ID_ = #{companyId}
@@ -118,28 +120,24 @@
select
ID_ as id,
COMPANY_ID_ as companyId,
- DEPT_ID_ as deptId,
FOOD_VARIETY_ as foodVariety,
STANDARD_ID_ as standardId,
STANDARD_NAME_ as standardName,
UNIT_ as unit,
+ OPERA_SYMBOL_ as operaSymbol,
UPPER_LIMIT_ as upperLimit,
--- LOWER_LIMIT_ as lowerLimit,
RULE_NUM_ as ruleNum,
+ RULE_REDUCE_ as ruleReduce,
RULE_ADD_ as ruleAdd,
RULE_ADD_END_ as ruleAddEnd,
- RULE_REDUCE_ as ruleReduce,
- STANDARD_PRICE_ as standardPrice,
RULE_PRICE_ as rulePrice,
RULE_REDUCE_PRICE_ as ruleReducePrice,
UPDATE_TIME_ as updateTime,
- REMARKS_ as remarks,
- OPERA_SYMBOL_ as operaSymbol
- from D_CHECK_STANDARD
- where
+ REMARKS_ as remarks
+ FROM D_CHECK_STANDARD
+ WHERE
COMPANY_ID_ = #{companyId}
- and DEPT_ID_ = #{deptId}
- and FOOD_VARIETY_ = #{foodVariety}
+ AND FOOD_VARIETY_ = #{foodVariety}
ORDER by STANDARD_ID_ + 0
</select>
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
index 71f1e23..72a7b16 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -648,34 +648,34 @@
}
}
- /**
- * 鏍规嵁鍏ュ簱鏁版嵁淇℃伅锛岃幏鍙栨鏌ラ」淇℃伅锛屽鏋滃綋鍓嶆暟鎹凡缁忔娴嬪畬鎴愶紝鏌ヨ妫�娴嬬粨鏋滐紝濡傛灉娌℃湁妫�娴嬪畬鎴愬垯鏍规嵁妫�娴嬮」閰嶇疆鑾峰彇闇�瑕佹娴嬬殑椤圭洰淇℃伅
- *
- * @param data
- * @return
- */
- @RequestMapping("/get-check-item")
- public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutData data) {
- try {
- return inoutManager.getCheckItem(data);
- } catch (Exception e) {
- log.error("鍚庡彴寮傚父:{}", e);
- return new PageResponse<List<CheckItemData>>(
- RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage());
- }
- }
+// /**
+// * 鏍规嵁鍏ュ簱鏁版嵁淇℃伅锛岃幏鍙栨鏌ラ」淇℃伅锛屽鏋滃綋鍓嶆暟鎹凡缁忔娴嬪畬鎴愶紝鏌ヨ妫�娴嬬粨鏋滐紝濡傛灉娌℃湁妫�娴嬪畬鎴愬垯鏍规嵁妫�娴嬮」閰嶇疆鑾峰彇闇�瑕佹娴嬬殑椤圭洰淇℃伅
+// *
+// * @param data
+// * @return
+// */
+// @RequestMapping("/get-check-item")
+// public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutData data) {
+// try {
+// return inoutManager.getCheckItem(data);
+// } catch (Exception e) {
+// log.error("鍚庡彴寮傚父:{}", e);
+// return new PageResponse<List<CheckItemData>>(
+// RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage());
+// }
+// }
- /**
- * 鍒嗛〉鑾峰彇鏁版嵁淇℃伅
- *
- * @param param
- * @return
- */
- @RequestMapping("/page-check-data")
- public PageResponse<Page<InoutData>> pageCheckData(
- @RequestBody InoutParam param) {
- return inoutManager.pageCheckData(param);
- }
+// /**
+// * 鍒嗛〉鑾峰彇鏁版嵁淇℃伅
+// *
+// * @param param
+// * @return
+// */
+// @RequestMapping("/page-check-data")
+// public PageResponse<Page<InoutData>> pageCheckData(
+// @RequestBody InoutParam param) {
+// return inoutManager.pageCheckData(param);
+// }
/**
* 閬撻椄鎺у埗
@@ -776,7 +776,7 @@
}
/**
- * 鍒嗛〉鑾峰彇鎵︽牱璁板綍淇℃伅
+ * 鍒嗛〉鑾峰彇鎵︽牱鏁版嵁
*
* @param param
* @return
@@ -787,7 +787,7 @@
}
/**
- * 鎵︽牱椤甸潰鎻愪氦
+ * 鎵︽牱椤甸潰鎻愪氦鏇存柊
*
* @param data
* @return
@@ -797,4 +797,38 @@
return inoutManager.updateSampleData(data);
}
+
+ /**
+ * 鍒嗛〉鑾峰彇鍖栭獙鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/page-check-data")
+ public PageResponse<Page<InoutCheckData>> pageCheckData(@RequestBody InoutCheckParam param) {
+ return inoutManager.pageCheckData(param);
+ }
+
+ /**
+ * 鑾峰彇鍖栭獙椤逛俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ @RequestMapping("/get-check-item")
+ public PageResponse<List<CheckItemData>> getCheckItem(@RequestBody InoutCheckParam param) {
+ return inoutManager.getCheckItemData(param);
+ }
+
+ /**
+ * 鍖栭獙椤甸潰鎻愪氦鏇存柊
+ *
+ * @param data
+ * @return
+ */
+ @RequestMapping("/update-check1")
+ public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) {
+
+ return inoutManager.updateCheckData(data);
+ }
}
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
index 5e461b1..b37c3fc 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
@@ -1,9 +1,12 @@
package com.ld.igds.inout.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ld.igds.check.dto.CheckItemData;
+import com.ld.igds.inout.InoutConstant;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 鍑哄叆搴撴墻鏍锋暟鎹皝瑁�
@@ -15,51 +18,66 @@
public class InoutCheckData implements Serializable {
private static final long serialVersionUID = 1L;
-
+
+ /*-----鍩虹淇℃伅-----*/
+
//娴佹按鍙�
private String id;
-
//缁勭粐缂栫爜
private String companyId;
-
//搴撳尯缂栫爜
private String deptId;
-
//鍑哄叆搴撶被鍨�,IN=鍏ュ簱锛孫UT=鍑哄簱
private String type;
-
//娴佺▼杩涘害
private String progress;
-
//鏁版嵁鐘舵��
private String recordStatus;
-
//鏅烘収鍗″彿
private String intelCard;
-
//鐧昏鏃堕棿
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date registerTime;
-
//鐧昏浜�
private String registerUser;
-
//杞﹁埞鍙�
private String plateNum;
+ //瑁呭嵏浠撳簱
+ private String depotId;
+ //绮鍝佺
+ private String foodVariety;
+ //璐ㄦ鍗曞彿
+ private String checkId;
+ //鍗曚环
+ private Double price;
+
+ /*-----鎵︽牱淇℃伅-----*/
//鎵︽牱浜�
private String sampleUser;
-
//鎵︽牱鏃堕棿
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sampleTime;
-
//鎵︽牱鏂瑰紡锛�0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満
private String sampleType;
-
- //璐ㄦ鍗曞彿
- private String checkId;
-
- //鎵︽牱鐘舵��
+ //鎵︽牱鐘舵��()锛孨ONE-鏈墻鏍凤紝SAMPLE-宸叉墻鏍�
private String sampleStatus;
+
+ /*-----鍖栭獙淇℃伅-----*/
+
+ //妫�楠屼汉
+ private String checkUser;
+ //璐ㄦ鏃堕棿
+ private Date checkTime;
+ //妫�楠岀粨鏋滐紝NONE-鏈楠岋紝PASS-宸叉楠岋紝UNPASS-涓嶅悎鏍�
+ private String checkStatus;
+ //绮瀹氱瓑
+ private String foodLevel;
+ //璐ㄦ鎵ｉ噸
+ private double deCheck = 0.0;
+ //璐ㄦ澧為噸
+ private double addCheck = 0.0;
+
+ //鍖栭獙椤规暟鎹俊鎭�
+ private List<CheckItemData> checkItems;
}
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java
index ebb9163..f80d0b6 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckParam.java
@@ -1,11 +1,8 @@
package com.ld.igds.inout.dto;
-import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.data.BaseParam;
import lombok.Data;
import lombok.EqualsAndHashCode;
-
-import java.util.Date;
/**
* 鍑哄叆搴�-鎵︽牱鍙傛暟
@@ -18,7 +15,6 @@
@EqualsAndHashCode(callSuper = false)
public class InoutCheckParam extends BaseParam {
- public String plateNum;// 杞︾墝鍙�
private String id;// 娴佹按鍙�
@@ -28,5 +24,12 @@
private String checkId;// 鍖栭獙鍗曞彿
+ /*鎵︽牱椤甸潰鏌ヨ鏉′欢*/
+ public String plateNum;// 杞︾墝鍙�
private String sampleStatus; //鎵︽牱鐘舵��
+
+ /*鍖栭獙椤甸潰鏌ヨ鏉′欢*/
+ private String checkStatus; //鎵︽牱鐘舵��
+ private String depotId;
+ private String foodVariety;
}
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 a3e5e3d..a0e1cad 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
@@ -572,35 +572,35 @@
return data;
}
- public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
+// public PageResponse<Page<InoutData>> pageRecordData(InoutParam param) {
+//
+// log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
+// param.getLimit(), param.getCurr());
+//
+// Page<InoutData> result = inoutService.pageRecordData(param);
+//
+// if (null == result.getRecords() || result.getRecords().isEmpty()) {
+// return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+// "鑾峰彇鍒版暟鎹俊鎭负绌�");
+// }
+//
+// return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+// }
- log.debug("鍒嗛〉淇℃伅--page={},limit={},cuur={}", param.getPage(),
- param.getLimit(), param.getCurr());
-
- Page<InoutData> result = inoutService.pageRecordData(param);
-
- if (null == result.getRecords() || result.getRecords().isEmpty()) {
- return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
- "鑾峰彇鍒版暟鎹俊鎭负绌�");
- }
-
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
-
- /**
- * @param param
- * @return
- */
- public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
- // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
- if (!"NONE".equals(param.getCheckStatus())) {
- param.setProgress(null);
- }
- // 璁剧疆鍒嗗簱Id
- String deptId = ContextUtil.subDeptId(null);
- param.setDeptId(deptId);
- return pageRecordData(param);
- }
+// /**
+// * @param param
+// * @return
+// */
+// public PageResponse<Page<InoutData>> pageCheckData(InoutParam param) {
+// // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
+// if (!"NONE".equals(param.getCheckStatus())) {
+// param.setProgress(null);
+// }
+// // 璁剧疆鍒嗗簱Id
+// String deptId = ContextUtil.subDeptId(null);
+// param.setDeptId(deptId);
+// return pageRecordData(param);
+// }
public PageResponse<InoutData> inoutComplete(InoutData data) throws Exception {
@@ -642,20 +642,20 @@
return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
}
- /**
- * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
- *
- * @param data
- * @return
- */
- public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
-
- List<CheckItemData> result = checkStandardManager.listCheckItem(
- data.getCheckId(), data.getCompanyId(), data.getDeptId(),
- data.getFoodVariety());
-
- return new PageResponse<>(RespCodeEnum.CODE_0000, result);
- }
+// /**
+// * 鎵︽牱鍖栭獙椤甸潰鑾峰彇妫�楠岄」鏉＄洰淇℃伅
+// *
+// * @param data
+// * @return
+// */
+// public PageResponse<List<CheckItemData>> getCheckItem(InoutData data) {
+//
+// List<CheckItemData> result = checkStandardManager.listCheckItem(
+// data.getCheckId(), data.getCompanyId(), data.getDeptId(),
+// data.getFoodVariety());
+//
+// return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+// }
/**
* 鍒犻櫎骞跺畬鎴�
@@ -1091,7 +1091,7 @@
}
//鑻ユ煡璇㈡潯浠朵负宸叉墻鏍凤紝鍒欐祦绋嬬疆绌猴紱鑻ユ湭鎵︽牱锛屽垯娴佺▼涓嶅鐞嗭紝浠嶄负鎵︽牱鍖栭獙娴佺▼(CHECK)
- if ("SAMPLE".equals(param.getSampleStatus())) {
+ if (!"NONE".equals(param.getSampleStatus())) {
param.setProgress(null);
}
@@ -1124,12 +1124,14 @@
"褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
}
- //鎵︽牱淇℃伅
- curData.setSampleTime(data.getSampleTime());
- curData.setSampleType(data.getSampleType());
- curData.setSampleUser(data.getSampleUser());
-
- String msg = inoutService.updateSampleData(curData);
+ //鎵︽牱鏃堕棿鍜屾墻鏍蜂汉
+ if(StringUtils.isEmpty(data.getSampleUser())){
+ data.setSampleUser(ContextUtil.getLoginUserCName());
+ }
+ if(null == data.getSampleTime()){
+ data.setSampleTime(new Date());
+ }
+ String msg = inoutService.updateSampleData(data);
if (null != msg) {
return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
@@ -1143,4 +1145,102 @@
}
}
+ /**
+ * @param param
+ * @return
+ */
+ public PageResponse<Page<InoutCheckData>> pageCheckData(InoutCheckParam param) {
+
+ if (StringUtils.isEmpty(param.getCompanyId())) {
+ param.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(param.getDeptId())) {
+ param.setDeptId(ContextUtil.subDeptId(null));
+ }
+ // 濡傛灉鏄凡鍖栭獙锛屽垯灏嗘祦绋嬬姸鎬佺疆绌猴紝濡傛灉鏄湭鍖栭獙锛屽垯娴佺▼鐘舵�佷笉澶勭悊锛屼粛鏄疌HECK鐘舵��
+ if (!"NONE".equals(param.getCheckStatus())) {
+ param.setProgress(null);
+ }
+
+ Page<InoutCheckData> checkList = inoutService.pageCheckData(param);
+
+
+ if (null == checkList.getRecords() || checkList.getRecords().isEmpty()) {
+ return new PageResponse<>(RespCodeEnum.CODE_2000.getCode(),
+ "鑾峰彇鍒版暟鎹俊鎭负绌�");
+ }
+ return new PageResponse<>(RespCodeEnum.CODE_0000, checkList);
+ }
+
+ /**
+ * 鑾峰彇鍖栭獙椤逛俊鎭�
+ *
+ * @param param
+ * @return
+ */
+ public PageResponse<List<CheckItemData>> getCheckItemData(InoutCheckParam param) {
+
+ try {
+ List<CheckItemData> result = checkStandardManager.listCheckItem(param.getCheckId(),
+ param.getCompanyId(), param.getFoodVariety());
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000, result);
+ } catch (Exception e) {
+ return new PageResponse<>(
+ RespCodeEnum.CODE_1111.getCode(), "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+ }
+ }
+
+ @Transactional(rollbackFor = Exception.class)
+ public PageResponse<InoutCheckData> updateCheckData(InoutCheckData data){
+ try {
+
+ // 鑾峰彇涓氬姟鏁版嵁淇℃伅
+ InoutParam param = new InoutParam();
+ param.setCompanyId(data.getCompanyId());
+ param.setId(data.getId());
+ InoutData curData = inoutService.inoutProgressQuery(param);
+ if (null == curData) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "娌℃湁鑾峰彇鍒板叆搴撲笟鍔℃暟鎹俊鎭紝鏇存柊澶辫触", data);
+ }
+ if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "褰撳墠娴佺▼宸茬粡缁撴潫锛屼笉鏀寔淇敼");
+ }
+ curData.setCheckStatus(data.getCheckStatus());
+
+ //鏇存柊涓嬩竴娴佺▼鐘舵��
+ if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) {
+ curData = updateInBasicInfo(curData, null);
+ // 鑻ュ寲楠岀粨鏋滀笉鍚堟牸锛屽垽鏂厤缃悗缁祦绋�
+ if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) {
+ curData = checkNoPass(curData);
+ }
+ }
+
+ data.setCheckStatus(curData.getCheckStatus());
+ //鍖栭獙浜恒�佸寲楠屾椂闂�
+ if(StringUtils.isEmpty(data.getCheckUser())){
+ data.setCheckUser(ContextUtil.getLoginUserCName());
+ }
+ if(null == data.getCheckTime()){
+ data.setCheckTime(new Date());
+ }
+
+ String msg = inoutService.updateCheckData(data);
+
+ if (null != msg) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg);
+ }
+ //TODO 鏇存柊鍖栭獙椤逛俊鎭�
+
+ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "鎵ц鎴愬姛");
+ } catch (Exception e) {
+ return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(),
+ "鍚庡彴寮傚父锛�" + e.getMessage(), null);
+ }
+
+ }
+
}
\ No newline at end of file
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
index 22320b5..32277b1 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.ld.igds.inout.dto.InoutCheckData;
import com.ld.igds.inout.dto.InoutCheckParam;
-import com.ld.igds.inout.dto.InoutData;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -24,12 +23,30 @@
List<InoutCheckData> pageSampleData(@Param("page") Page<InoutCheckData> page,
@Param("param") InoutCheckParam param);
-
/**
* 鏇存柊鎵︽牱鏁版嵁
*
* @param data
* @return
*/
- int updateSampleData(@Param("data") InoutData data);
+ int updateSampleData(@Param("data") InoutCheckData data);
+
+
+ /**
+ * 鍒嗛〉鑾峰彇鍖栭獙鏁版嵁
+ *
+ * @param page
+ * @param param
+ * @return
+ */
+ List<InoutCheckData> pageCheckData(@Param("page") Page<InoutCheckData> page,
+ @Param("param") InoutCheckParam param);
+
+ /**
+ * 鏇存柊鍖栭獙鏁版嵁
+ *
+ * @param data
+ * @return
+ */
+ int updateCheckData(@Param("data") InoutCheckData data);
}
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 c3fc0e4..b35779e 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
@@ -259,5 +259,21 @@
* @return
* @throws Exception
*/
- String updateSampleData(InoutData data);
+ String updateSampleData(InoutCheckData data);
+
+ /**
+ * 鍒嗛〉鑾峰彇鍖栭獙鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ Page<InoutCheckData> pageCheckData(InoutCheckParam param);
+
+ /**
+ * 鏇存柊鍖栭獙淇℃伅
+ * @param data
+ * @return
+ * @throws Exception
+ */
+ String updateCheckData(InoutCheckData data);
}
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 9a35a08..b7eb6ed 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
@@ -787,7 +787,7 @@
}
@Override
- public String updateSampleData(InoutData data) {
+ public String updateSampleData(InoutCheckData data) {
if (StringUtils.isEmpty(data.getCompanyId())) {
data.setCompanyId(ContextUtil.getCompanyId());
}
@@ -799,4 +799,42 @@
return null;
}
+ @Override
+ public Page<InoutCheckData> pageCheckData(InoutCheckParam param) {
+
+ //璁剧疆璧峰鍜屾埅姝㈡椂闂�
+ if (null != param.getStart()) {
+ param.setStart(DateUtil.getCurZero(param.getStart()));
+ }
+ if (null != param.getEnd()) {
+ param.setEnd(DateUtil.getNextZero(param.getEnd()));
+ }
+
+ // 璁剧疆妫�楠屽崟鎹殑妯＄硦鏌ヨ
+ if (StringUtils.isNotEmpty(param.getCheckId())) {
+ param.setCheckId("%" + param.getCheckId() + "%");
+ }
+
+ Page<InoutCheckData> page = new Page<>(param.getPage(), param.getLimit());
+ page.setSearchCount(true);
+
+ List<InoutCheckData> records = inoutCheckMapper.pageCheckData(page, param);
+ page.setRecords(records);
+
+ return page;
+ }
+
+ @Override
+ public String updateCheckData(InoutCheckData data) {
+ if (StringUtils.isEmpty(data.getCompanyId())) {
+ data.setCompanyId(ContextUtil.getCompanyId());
+ }
+ if (StringUtils.isEmpty(data.getDeptId())) {
+ data.setCompanyId(ContextUtil.subDeptId(null));
+ }
+
+ int num = inoutCheckMapper.updateCheckData(data);
+ return null;
+ }
+
}
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 8c2856d..35e15e7 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.ld.igds.inout.mapper.InoutCheckMapper">
+ <!--鍒嗛〉鑾峰彇鎵︽牱鏁版嵁-->
<select id="pageSampleData" resultType="com.ld.igds.inout.dto.InoutCheckData"
parameterType="com.ld.igds.inout.dto.InoutCheckParam">
select
@@ -41,15 +42,74 @@
ORDER BY REGISTER_TIME_
</select>
- <update id="updateSampleData" parameterType="com.ld.igds.inout.dto.InoutData">
- update D_INOUT_RECORD set
+ <!--鏇存柊鎵︽牱淇℃伅-->
+ <update id="updateSampleData" parameterType="com.ld.igds.inout.dto.InoutCheckData">
+ UPDATE D_INOUT_RECORD SET
<if test="data.sampleUser != null">SAMPLE_USER_ = #{data.sampleUser},</if>
<if test="data.sampleTime != null">SAMPLE_TIME_ = #{data.sampleTime},</if>
<if test="data.sampleType != null">SAMPLE_TYPE_ = #{data.sampleType},</if>
TYPE_ = #{data.type}
- where
+ WHERE
COMPANY_ID_ =#{data.companyId}
- and ID_ =#{data.id}
+ AND ID_ =#{data.id}
+ </update>
+
+ <!--鍒嗛〉鑾峰彇鍖栭獙鏁版嵁-->
+ <select id="pageCheckData" resultType="com.ld.igds.inout.dto.InoutCheckData"
+ parameterType="com.ld.igds.inout.dto.InoutCheckParam">
+ select
+ ID_ as id,
+ COMPANY_ID_ as companyId,
+ DEPT_ID_ as deptId,
+ TYPE_ as type,
+ PROGRESS_ as progress,
+ RECORD_STATUS_ as recordStatus,
+ INTEL_CARD_ as intelCard,
+ REGISTER_TIME_ as registerTime,
+ REGISTER_USER_ as registerUser,
+ DEPOT_ID_ as depotId,
+ FOOD_VARIETY_ as foodVariety,
+ PLATE_NUM_ as plateNum,
+ SAMPLE_USER_ as sampleUser,
+ SAMPLE_TIME_ as sampleTime,
+ CHECK_USER_ as checkUser,
+ CHECK_TIME_ as checkTime,
+ CHECK_ID_ as checkId,
+ CHECK_STATUS_ AS checkStatus,
+ IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
+ from
+ D_INOUT_RECORD
+ <where>
+ <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>
+ <if test="param.checkId != null and param.checkId != '' ">AND CHECK_ID_ like #{param.checkId}</if>
+ <if test="param.foodVariety != null and param.foodVariety != '' ">AND FOOD_VARIETY_ = #{param.foodVariety}</if>
+ <if test="param.depotId != null and param.depotId != '' ">AND DEPOT_ID_ = #{param.depotId}</if>
+ <if test="param.progress != null and param.progress != '' ">AND PROGRESS_ = #{param.progress}</if>
+ <if test="param.start != null">AND REGISTER_TIME_ <![CDATA[ >= ]]>#{param.start,jdbcType=TIMESTAMP}</if>
+ <if test="param.end != null">AND REGISTER_TIME_ <![CDATA[ <= ]]>#{param.end,jdbcType=TIMESTAMP}</if>
+ <if test="param.checkStatus != null and param.checkStatus != 'NONE' ">AND CHECK_STATUS_ != 'NONE' AND CHECK_STATUS_ IS NOT NULL</if>
+ <if test="param.checkStatus != null and param.checkStatus == 'NONE' ">AND CHECK_STATUS_ = 'NONE'</if>
+ </where>
+ AND RECORD_STATUS_ != 'DEL'
+ AND RECORD_STATUS_ != 'ERROR'
+ ORDER BY REGISTER_TIME_
+ </select>
+
+ <!--鏇存柊鍖栭獙淇℃伅-->
+ <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutCheckData">
+ UPDATE D_INOUT_RECORD SET
+ <if test="data.depotId != null">DEPOT_ID_ = #{data.depotId},</if>
+ <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if>
+ <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if>
+ <if test="data.checkStatus != null">CEHCK_STATUS = #{data.checkStatus},</if>
+ <if test="data.foodLevel != null">FOOD_LEVEL = #{data.foodLevel},</if>
+ <if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
+ <if test="data.addCheck != null">ADD_CHECK = #{data.addCheck},</if>
+ TYPE_ = #{data.type}
+ WHERE
+ COMPANY_ID_ =#{data.companyId}
+ AND ID_ =#{data.id}
</update>
</mapper>
\ No newline at end of file
diff --git a/igds-web/src/main/resources/static/admin/inout/in-check.js b/igds-web/src/main/resources/static/admin/inout/in-check.js
index 0a780a4..3dcec44 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-check.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -1,5 +1,6 @@
//褰撳墠鑺傜偣 鍏ュ簱璐ㄦ
var layer;
+var laydate;
var form;
var table;
var page = 1;
@@ -12,7 +13,7 @@
layer = layui.layer;
form = layui.form;
table = layui.table;
- var laydate = layui.laydate;
+ laydate = layui.laydate;
laydate.render({
elem: '#start',
@@ -27,9 +28,10 @@
});
laydate.render({
- elem: '#foodYear',
+ elem: '#checkTime',
theme: '#7b8e9f',
- type: 'year',
+ format: 'yyyy-MM-dd HH:mm:ss',
+ type: 'datetime'
});
// 鍒濆鍖栬〃鍗曟暟鎹�
@@ -295,9 +297,11 @@
function showDetail(obj) {
curCheckData = obj.data;
- // console.log(curCheckData);
- curCheckData.foodYear = dateFtt("yyyy", new Date());
+ curSampleData = obj.data;
+ if(!curCheckData.checkTime){
+ curCheckData.checkTime = dateFtt("yyyy-MM-dd HH:mm:ss", new Date());
+ }
curCheckData.checkUser = checkUser;
if (curCheckData.checkStatus == "NONE") {
//闅愯棌杞︾墝閮ㄥ垎淇℃伅
@@ -311,7 +315,7 @@
layer.open({
type: 1,
title: "鍖栭獙鍗曟槑缁�",
- area: ['1400px', '650px'],
+ area: ['1400px', '700px'],
shade: 0,
content: $('#checkDetail'),
btnAlign: 'c',
@@ -332,8 +336,7 @@
// 鑾峰彇鍖栭獙椤逛俊鎭�
flushCheckItem(null);
-};
-
+}
/**
* 鍒锋柊鍖栭獙缁撴灉椤�
@@ -341,6 +344,7 @@
function flushCheckItem(foodVariety) {
curCheckItems = null;
$("#check-result-tip").text("妫�楠岀粨鏋滐細#");
+ $("#price-result-tip").text("绮鍗曚环锛�#鍏�/鍏枻");
curCheckData.foodVariety = foodVariety;
var index = layer.load();
@@ -391,9 +395,9 @@
}
});
if (msg) {
- $("#check-result-tip").text("妫�楠岀粨鏋滐細" + msg);
+ $("#check-result-tip").text("妫�楠岀粨鏋滐細" + msg + "锛涚伯椋熷崟浠凤細#鍏�/鍏枻");
} else {
- $("#check-result-tip").text("妫�楠岀粨鏋滐細鍚堟牸");
+ $("#check-result-tip").text("妫�楠岀粨鏋滐細鍚堟牸" + "锛涚伯椋熷崟浠凤細#鍏�/鍏枻");
}
};
@@ -411,28 +415,58 @@
even: true,
cols: [[{
field: 'standardName',
- title: '鍖栭獙椤圭洰',
+ title: '妫�楠岄」鐩�',
align: 'center',
- width: '20%'
+ width: '10%'
}, {
field: 'value',
- title: '鍖栭獙缁撴灉',
+ title: '妫�楠屽��',
align: 'center',
- width: '20%',
+ width: '10%',
edit: 'text'
+ }, {
+ field: 'operaSymbol',
+ title: '鏍囧噯鍊�',
+ align: 'center',
+ width: '10%'
}, {
field: 'unit',
title: '鍗曚綅',
align: 'center',
width: '10%'
}, {
- field: 'standardValue',
- title: '鍖栭獙鏍囧噯',
+ field: 'deNum',
+ title: '鎵ｉ噸',
align: 'center',
- width: '15%'
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'addNum',
+ title: '澧為噸',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'dePrice',
+ title: '鎵ｄ环',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'addPrice',
+ title: '澧炰环',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
+ }, {
+ field: 'result',
+ title: '妫�楠岀粨鏋�',
+ align: 'center',
+ width: '10%',
+ edit: 'text'
}, {
field: 'remarks',
- title: '璇� 鏄�',
+ title: '澶囨敞璇存槑',
align: 'center',
edit: 'text'
}]]
@@ -477,7 +511,7 @@
var index = layer.load();
$.ajax({
type: "POST",
- url: "../../basic/inout/update-check",
+ url: "../../basic/inout/update-check1",
dataType: "json",
contentType: "application/json;charset=UTF-8",
data: JSON.stringify(curCheckData),
@@ -516,37 +550,43 @@
contentType: "application/json;charset=UTF-8",
cols: [[{
field: 'checkId',
- title: '妫�楠屽崟鍙�',
- width: '13%',
+ title: '璐ㄦ鍗曞彿',
+ width: '10%',
style: 'color: #f67d06;font-weight: bold'
}, {
- field: 'plateNum',
- title: '杞﹁埞鍙�',
- width: '11%',
- style: 'font-weight: bold',
+ field: 'registerTime',
+ title: '鐧昏鏃堕棿',
+ width: '15%',
+ style: 'font-weight: bold'
+ }, {
+ field: 'sampleStatus',
+ title: '鏄惁鎵︽牱',
+ width: '10%',
templet: function (item) {
- if (item.checkStatus != "NONE") {
- return item.plateNum;
- } else {
- var result = replaceStr(item.plateNum);
- return result == null ? "" : result;
+ if (item.sampleStatus == null) {
+ return "鏈墻鏍�";
+ }
+ if (item.sampleStatus == 'NONE') {
+ return "鏈墻鏍�";
+ }
+ if (item.sampleStatus == 'SAMPLE') {
+ return "宸叉墻鏍�";
}
}
}, {
- field: 'customerName',
- title: '寰�鏉ュ崟浣�',
- templet: function (item) {
- if (item.checkStatus != "NONE") {
- return item.customerName;
- } else {
- var result = replaceStr(item.customerName);
- return result == null ? "" : result;
- }
- }
+ field: 'sampleUser',
+ title: '鎵︽牱浜�',
+ width: '10%',
+ style: 'font-weight: bold'
+ }, {
+ field: 'sampleTime',
+ title: '鎵︽牱鏃堕棿',
+ width: '15%',
+ style: 'font-weight: bold'
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '10%',
+ width: '11%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -560,7 +600,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '10%',
+ width: '11%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, data) {
@@ -574,7 +614,6 @@
}, {
field: 'checkStatus',
title: '妫�楠岀粨鏋�',
- width: '10%',
style: 'font-weight: bold',
templet: function (item) {
if (item.checkStatus == 'NONE') {
@@ -589,13 +628,9 @@
return item.checkStatus == null ? "" : item.checkStatus;
}
}, {
- field: 'registerTime',
- title: '鐧昏鏃堕棿',
- width: '14%'
- }, {
field: '',
title: '鎿嶄綔',
- width: '9%',
+ width: '8%',
toolbar: "#barControl"
}]],
where: param,
diff --git a/igds-web/src/main/resources/static/admin/inout/in-sample.js b/igds-web/src/main/resources/static/admin/inout/in-sample.js
index 525ebf8..d51ee06 100644
--- a/igds-web/src/main/resources/static/admin/inout/in-sample.js
+++ b/igds-web/src/main/resources/static/admin/inout/in-sample.js
@@ -356,36 +356,9 @@
return time;
}
-function formatDateTime(date, format) {
- const o = {
- 'M+': date.getMonth() + 1, // 鏈堜唤
- 'd+': date.getDate(), // 鏃�
- 'h+': date.getHours() % 12 === 0 ? 12 : date.getHours() % 12, // 灏忔椂
- 'H+': date.getHours(), // 灏忔椂
- 'm+': date.getMinutes(), // 鍒�
- 's+': date.getSeconds(), // 绉�
- 'q+': Math.floor((date.getMonth() + 3) / 3), // 瀛ｅ害
- S: date.getMilliseconds(), // 姣
- a: date.getHours() < 12 ? '涓婂崍' : '涓嬪崍', // 涓婂崍/涓嬪崍
- A: date.getHours() < 12 ? 'AM' : 'PM', // AM/PM
- };
- if (/(y+)/.test(format)) {
- format = format.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
- }
- for (let k in o) {
- if (new RegExp('(' + k + ')').test(format)) {
- format = format.replace(
- RegExp.$1,
- RegExp.$1.length === 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length)
- );
- }
- }
- return format;
-}
-
function showDetail(obj) {
curSampleData = null;
- var nowTime = formatDateTime(new Date(), "yyyy-MM-dd HH:mm:ss");
+ var nowTime = dateFtt("yyyy-MM-dd HH:mm:ss", new Date());
$("#printTime").html(nowTime);
curSampleData = obj.data;
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-check.html b/igds-web/src/main/resources/templates/admin/inout/in-check.html
index ad13741..2f9816f 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-check.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-check.html
@@ -105,6 +105,11 @@
.layui-elem-quote {
padding: 10px;
color: blue;
+ margin-bottom: unset;
+ }
+
+ .input_ba {
+ background: #e7eaec !important;
}
</style>
@@ -117,16 +122,6 @@
<div class="qyzj-btnbox layui-clear">
<div class="rkbk-quick fl">
-
- <!-- <button type="button" class="rkbk-quick-btn layui-btn"-->
- <!-- onclick="flushData()">-->
- <!-- <i><img th:src="@{../../static/images/icon-shuaxin.png}" /></i>鍒锋柊-->
- <!-- </button>-->
- <!-- <button type="button" class="rkbk-quick-btn layui-btn"-->
- <!-- onclick="exportData()">-->
- <!-- <i><img th:src="@{../../static/images/icon-daochu.png}"/></i>瀵煎嚭-->
- <!-- </button>-->
-
<button type="button" class="rkbk-quick-btn layui-btn btn-violet"
onclick="checkExe('big')">
<i><img th:src="@{../../static/images/icon-hyd.png}"/></i>澶ц溅鎵︽牱
@@ -194,7 +189,6 @@
</ul>
</div>
<!--娴佺▼寮曞缁撴潫-->
-
</div>
<!--qyzj-btnbox end-->
@@ -219,17 +213,15 @@
autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁缂栫爜</label>
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
<div class="layui-input-block">
<input type="text" name="checkId" placeholder="璇疯緭鍏�"
autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
<label class="layui-form-label">绮鍝佺</label>
@@ -242,13 +234,11 @@
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <label class="layui-form-label">璧峰鏃堕棿</label>
<div class="layui-input-block">
- <input type="text" name="start" placeholder="璇疯緭鍏�"
- autocomplete="off"
+ <input type="text" name="start" placeholder="璇疯緭鍏�" autocomplete="off"
class="layui-input rkbk-search-input bg-date" id="start">
</div>
</div>
@@ -256,15 +246,13 @@
<div class="layui-col-xs3">
<div class="layui-form-item">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <label class="layui-form-label">鎴鏃堕棿</label>
<div class="layui-input-block">
- <input type="text" name="end" placeholder="璇疯緭鍏�"
- autocomplete="off"
+ <input type="text" name="end" placeholder="璇疯緭鍏�" autocomplete="off"
class="layui-input rkbk-search-input bg-date" id="end">
</div>
</div>
</div>
-
<div class="layui-col-xs3">
<div class="layui-form-item">
@@ -313,39 +301,30 @@
<col width="10%">
<col width="10%">
<col width="10%">
+ <col width="10%">
<col width="">
- <col width="15%">
+ <col width="10%">
</colgroup>
<thead>
<tr class="qyzj-table-tit">
- <th>鍗曟嵁鍙�</th>
- <th>杞︾墝</th>
- <th>寰�鏉ュ崟浣�</th>
- <th>鍝佺</th>
- <th>鐩爣浠撳簱</th>
- <th>鏄惁鍚堟牸</th>
- <th>鍖栭獙鏃堕棿</th>
- <th>绮浜у湴</th>
+ <th>璐ㄦ鍗曞彿</th>
+ <th>鐧昏鏃堕棿</th>
+ <th>鎵︽牱鐘舵��</th>
+ <th>鎵︽牱浜�</th>
+ <th>鎵︽牱鏃堕棿</th>
+ <th>绮鍝佺</th>
+ <th>瑁呭嵏浠撳簱</th>
+ <th>妫�楠岀粨鏋�</th>
<th>鎿嶄綔</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
-
</div>
- <!--qyzj-tabBox end-->
-
- <!--qyzj-page-wrap end-->
-
</div>
- <!--qyzj-con end-->
-
</div>
- <!--rk-main end-->
-
</div>
-<!--l-container end-->
<script th:inline="javascript">
var progress = [[${progress}]];
@@ -374,7 +353,6 @@
</script>
-
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
<script th:src="@{../../static/js/constant.js}"></script>
@@ -382,53 +360,61 @@
<script th:src="@{../../static/admin/inout/in-check.js}"></script>
<script type="text/html" id="barControl">
- <a class="layui-btn control-btn" lay-event="edit">缂栬緫</a>
+ <a class="layui-btn control-btn" lay-event="edit">鍖栭獙</a>
</script>
</body>
-<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
+<!-- 鍖栭獙淇℃伅 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
<form class="layui-form" id="form-detail" lay-filter="form-detail">
- <div class="layui-col-xs4" style="display: none;">
+ <div class="layui-col-xs12" style="display: none;">
<div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-瀹㈡埛</label>
+ <label class="layui-form-label">闅愯棌瀛楁-娴佹按缂栧彿</label>
<div class="layui-input-block">
- <input type="text" name="customerId" autocomplete="off"
- class="layui-input rkbk-search-input">
+ <input type="text" name="id" autocomplete="off" class="layui-input rkbk-search-input">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">妫�楠屽崟鍙�</label>
+ <label class="layui-form-label">璐ㄦ鍗曞彿</label>
<div class="layui-input-block">
<input type="text" name="checkId" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
+ class="layui-input input_ba" disabled="">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">杞� 鐗� 鍙�</label>
+ <label class="layui-form-label">鎵� 鏍� 浜�</label>
<div class="layui-input-block">
- <input type="text" name="plateNum" autocomplete="off"
- class="layui-input rkbk-search-input" disabled="">
+ <input type="text" name="sampleUser" autocomplete="off"
+ class="layui-input input_ba" disabled="">
</div>
</div>
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">妫�楠屼汉鍛�</label>
+ <label class="layui-form-label">鎵︽牱鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="sampleTime" autocomplete="off"
+ class="layui-input input_ba" disabled="">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">璐� 妫� 浜�</label>
<div class="layui-input-block">
<input type="text" name="checkUser" autocomplete="off"
- class="layui-input rkbk-search-input">
+ class="layui-input">
</div>
</div>
</div>
@@ -456,6 +442,26 @@
</div>
<div class="layui-col-xs4">
<div class="layui-form-item">
+ <label class="layui-form-label">璐ㄦ鏃堕棿</label>
+ <div class="layui-input-block">
+ <input type="text" name="checkTime" autocomplete="off"
+ class="layui-input">
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
+ <label class="layui-form-label">鏀剁伯瀹氫环</label>
+ <div class="layui-input-block">
+ <input type="text" name="price" id="price"
+ class="layui-input rkbk-search-input" placeholder="鏍规嵁绮绛夌骇甯﹀叆/鎵嬪姩褰曞叆">
+ <em class="kccz-data-dw">鍏�/鍏枻</em>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-col-xs4">
+ <div class="layui-form-item">
<label class="layui-form-label red">绮绛夌骇</label>
<div class="layui-input-block">
<select id="foodLevel" name="foodLevel" lay-filter="foodLevel">
@@ -466,46 +472,6 @@
</div>
</div>
</div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label">绮浜у湴</label>
- <div class="layui-input-block">
- <input type="text" name="foodLocation" autocomplete="off"
- class="layui-input"> <em class="kccz-data-dw cursor"
- onclick="showFoodLocation()">鈥�</em>
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label red">绮骞翠唤</label>
- <div class="layui-input-block">
- <input type="text" name="foodYear" id="foodYear" autocomplete="off"
- class="layui-input">
- </div>
- </div>
- </div>
- <div class="layui-col-xs4">
- <div class="layui-form-item">
- <label class="layui-form-label red">鏀剁伯瀹氫环</label>
- <div class="layui-input-block">
- <input type="text" name="price" id="price"
- class="layui-input rkbk-search-input" placeholder="璇疯緭鍏ュ崟浠�">
- <em class="kccz-data-dw">鍏�/鍏枻</em>
- </div>
- </div>
- </div>
-
- <div class="layui-col-xs4" style="display: none;">
- <div class="layui-form-item">
- <label class="layui-form-label">闅愯棌瀛楁-鏈�浣庝繚鎶や环鏍�</label>
- <div class="layui-input-block">
- <input type="text" name="price0"
- class="layui-input">
- </div>
- </div>
- </div>
-
<div class="layui-col-xs8">
<div class="layui-form-item">
<label class="layui-form-label">澶囨敞璇存槑</label>
@@ -527,74 +493,59 @@
</div>
</div>
</div>
+ <div class="layui-col-xs12" style="margin-bottom: 10px">
+ <div style="padding-left: 50px; color: #2ab5ad;">
+ <span style="font-weight: bold; margin-right: 10px;">澶囨敞璇存槑锛�1.缁撴灉鍒ゅ畾锛氱郴缁熸牴鎹悇鍖栭獙椤圭粨鏋滃垽瀹氾紝鏈�鍚庡寲楠岀粨鏋滈渶鎵嬪姩閫夋嫨纭锛�2.鍗曚环澶嶆牳锛氭牴鎹寲楠岄」閰嶇疆璁＄畻鐩稿叧澧炴墸浠凤紝鏈�鍚庡崟浠烽渶鎵嬪姩纭銆�</span>
+ </div>
+ </div>
<div class="layui-col-xs12">
<blockquote class="layui-elem-quote">
<div>
- <span style="font-weight: bold; margin-right: 10px;">绯荤粺鍒ゅ畾</span>
-<!-- <span id="check-result-level" style="margin-right: 25px;">绮绛夌骇锛�#</span>-->
-<!-- <span id="check-result-price" style="margin-right: 25px;">甯傚満浠凤細#</span>-->
-<!-- <span id="check-result-price0" style="margin-right: 25px;">鏈�浣庝繚鎶や环锛�#</span>-->
- <span id="check-result-tip" style="margin-right: 25px;">妫�楠岀粨鏋滐細#</span>
-
-<!-- <button type="button" class="layui-btn layui-btn-sm layui-btn-warm layui-btn-radius fr"-->
-<!-- onclick="">绯荤粺楠岃瘉-->
-<!-- </button>-->
-
- <span id="check-result-msg" style="margin-right: 25px;color: red;float: right;"></span>
+ <span style="font-weight: bold; margin-right: 10px;">绯荤粺鍒ゅ畾锛�</span>
+ <span id="check-result-tip" style="margin-right: 25px;">鍖栭獙缁撴灉#锛� 鏀剁伯鍗曚环锛�#鍏�/鍏枻</span>
+ <span id="check-result-msg" style="margin-right: 25px;color: red;float: right;">
+ <button style="margin-top: -6px;" class="rkbk-quick-btn layui-btn btn-blue" onclick="checkReset()">
+ <i><img th:src="@{../../static/images/icon-fuwei.png}"/></i>鍗曚环鍒ゅ畾
+ </button>
+ </span>
</div>
</blockquote>
</div>
-
</form>
<!-- 鍖栭獙缁撴灉淇℃伅 -->
- <table class="layui-table" id="tableCheckItem"
+ <table class="layui-table tableCheckItem" id="tableCheckItem"
lay-filter="tableCheckItem">
<colgroup>
- <col width="25%">
- <col width="25%">
- <col width="25%">
- <col width="25%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="10%">
+ <col width="">
</colgroup>
<thead>
<tr class="qyzj-table-tit">
- <th>鍖栭獙椤圭洰</th>
- <th>鍖栭獙缁撴灉</th>
+ <th>妫�楠岄」鐩�</th>
+ <th>妫�楠屽��</th>
+ <th>鏍囧噯鍊�</th>
<th>鍗曚綅</th>
- <th>鍚堟牸鏍囧噯</th>
- <th>璇存槑</th>
+ <th>鎵ｉ噸</th>
+ <th>澧為噸</th>
+ <th>鎵ｄ环</th>
+ <th>澧炰环</th>
+ <th>妫�楠岀粨鏋�</th>
+ <th>澶囨敞</th>
</tr>
</thead>
<tbody>
</tbody>
</table>
-</div>
-
-
-<!-- 寮瑰嚭寰�鏉ュ崟浣嶅垪琛� -->
-<div class="layui-tab-content" id="listCustomer" style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableCustomer"
- lay-filter="tableCustomer" style="margin: 0px;"></table>
-</div>
-
-<script type="text/html" id="toolbarCustomer">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushCustomer()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
-
-<!-- 寮瑰嚭绮浜у湴 -->
-<div class="layui-tab-content" id="listFoodLocation"
- style="display: none;">
- <table class="layui-table" lay-skin="nob" id="tableFoodLoaction"
- lay-filter="tableFoodLoaction" style="margin: 0px;"></table>
</div>
<!-- 寮瑰嚭妗嗙殑淇℃伅 -->
@@ -628,16 +579,4 @@
</tbody>
</table>
</div>
-
-<script type="text/html" id="toolbarFoodLocaton">
- <div class="">
- <div class="layui-col-xs6">
- <input type="text" id="key2" placeholder="杈撳叆缂栫爜鎴栬�呭悕绉扳�︹��" class="layui-input">
- </div>
- <div class="layui-col-xs6" style="padding-left: 10px;">
- <button class="layui-btn layui-btn-sm" onclick="flushFoodLocation()">鏌ヨ</button>
- </div>
- </div>
-</script>
-
</html>
diff --git a/igds-web/src/main/resources/templates/admin/inout/in-sample.html b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
index 95629ae..e91c4d7 100644
--- a/igds-web/src/main/resources/templates/admin/inout/in-sample.html
+++ b/igds-web/src/main/resources/templates/admin/inout/in-sample.html
@@ -20,34 +20,20 @@
width: 100%;
}
- #layui-table-page1 {
- text-align: right !important;
- }
-
.display-none {
display: none;
}
-
+ #layui-table-page1 {
+ text-align: right !important;
+ }
.control-btn {
height: 35px;
line-height: 30px;
background-color: #f67d06;
}
- .tip-red {
- text-align: right;
- padding-left: 40px;
- font-size: 16px;
- color: red;
- font-weight: bold;
- }
-
thead span {
font-weight: bold
- }
-
- #label1, #label4, #label5 {
- color: red;
}
.layui-select-disabled .layui-disabled {
@@ -109,6 +95,9 @@
.input_ba {
background: #e7eaec !important;
+ }
+ .layui-table-body {
+ height: 450px;
}
</style>
@@ -323,12 +312,10 @@
//鎵�灞炲垎搴�
var deptId = [[${deptId}]];
+ //搴撳尯鍚嶇О
var deptName = [[${deptName}]];
-
var inoutProgress = [[${inoutProgress}]];
-
</script>
-
<script th:src="@{../../static/plugins/layui/layui.js}"></script>
<script th:src="@{../../static/js/jquery.min.js}"></script>
@@ -341,7 +328,7 @@
</script>
</body>
-<!-- 鍖栭獙淇℃伅锛屽寘鎷熀鏈俊鎭拰鍖栭獙缁撴灉 -->
+<!-- 鎵︽牱淇℃伅 -->
<div class="layui-tab-content" id="checkDetail" style="display: none;">
<!-- 琛ㄥ崟鍩烘湰淇℃伅 -->
<div style="height: 100%; width: 55%; float: left">
--
Gitblit v1.9.3