From 3d8dfc3dd31f73dd7ba33d020193f9ab0764fa56 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 04 十一月 2023 00:54:54 +0800
Subject: [PATCH] 入库--粮食性质
---
igds-web/src/main/resources/static/admin/inout/in-check.js | 31 +++++++++++++--
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 1
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 2 +
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 14 +++++++
igds-web/src/main/resources/templates/admin/inout/in-check.html | 31 +++++++++------
igds-inout/src/main/resources/mapper/InoutCheckMapper.xml | 2 +
igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java | 9 +++-
7 files changed, 71 insertions(+), 19 deletions(-)
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 f82095f..6c34071 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
@@ -197,6 +197,10 @@
Constant.TRIGGER_PARENT_FOOD_VARIETY, user.getCompanyId());
view.addObject("listFoodVariety", listFoodVariety);
+ // 绮鎬ц川涓嬫媺妗�
+ List<DicTrigger> listFoodType = inoutCommonManager.getDicTrigger(Constant.TRIGGER_PARENT_FOOD_TYPE, user.getCompanyId());
+ view.addObject("listFoodType", listFoodType);
+
// 绮绛夌骇涓嬫媺妗�
List<DicTrigger> listFoodLevel = inoutCommonManager.getDicTrigger(
Constant.TRIGGER_PARENT_FOOD_LEVEL, user.getCompanyId());
@@ -288,7 +292,7 @@
view.addObject("cardDto", conf);
//绉伴噸椤甸潰鍒濆鍖�
- inoutManager.initInoutWeight(listInoutConf,sort);
+ inoutManager.initInoutWeight(listInoutConf, sort);
view.setViewName("admin/inout/in-weight");
return view;
@@ -696,6 +700,7 @@
/**
* 鏍规嵁璐ㄦ鍗曞彿鑾峰彇鍑哄叆搴撲俊鎭�
+ *
* @param param
* @return
*/
@@ -715,7 +720,7 @@
*/
@RequestMapping("/submit-checkItem")
@Transactional
- public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data)throws Exception {
+ public PageResponse<InoutCheckData> submitCheckItem(@RequestBody InoutCheckData data) throws Exception {
return inoutManager.submitCheckData(data);
}
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 ca05916..d18dd78 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
@@ -46,6 +46,8 @@
private String depotId;
//绮鍝佺
private String foodVariety;
+ //绮鍝佺
+ private String foodType;
//璐ㄦ鍗曞彿
private String checkId;
//鍗曚环
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 e4a9896..28bac20 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
@@ -901,6 +901,7 @@
curData.setCheckItems(data.getCheckItems());
curData.setCheckTime(data.getCheckTime());
curData.setDepotId(data.getDepotId());
+ curData.setFoodType(data.getFoodType());
if (StringUtils.isEmpty(data.getCheckUser())) {
curData.setCheckUser(ContextUtil.getLoginUserCName());
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 712285c..9b2fa2e 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -24,6 +24,15 @@
<Property name="label">绮瀹氫环</Property>
<Property name="required">false</Property>
</PropertyDef>
+ <PropertyDef name="foodType">
+ <Property name="label">绮鎬ц川</Property>
+ <Property name="required">true</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
+ </Property>
+ </PropertyDef>
<Reference name="checkItems">
<Property name="parameter">
<Entity>
@@ -609,6 +618,11 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
+ <Property name="name">foodType</Property>
+ <Property name="property">foodType</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">sampleUser</Property>
<Property name="property">sampleUser</Property>
<Editor/>
diff --git a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
index 29ed5d6..2bcd325 100644
--- a/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
+++ b/igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -80,6 +80,7 @@
CHECK_STATUS_ AS checkStatus,
REMARKS_ AS remarks,
FOOD_YEAR_ AS foodYear,
+ FOOD_TYPE_ AS foodType,
IF(ISNULL(SAMPLE_TIME_),'NONE','SAMPLE') AS sampleStatus
from
D_INOUT_RECORD
@@ -115,6 +116,7 @@
<if test="data.foodLevel != null">FOOD_LEVEL_ = #{data.foodLevel},</if>
<if test="data.foodYear != null">FOOD_YEAR_ = #{data.foodYear},</if>
<if test="data.foodVariety != null">FOOD_VARIETY_ = #{data.foodVariety},</if>
+ <if test="data.foodType != null">FOOD_Type_ = #{data.foodType},</if>
<if test="data.deCheck != null">DE_CHECK_ = #{data.deCheck},</if>
<if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if>
<if test="data.price != null">PRICE_ = #{data.price},</if>
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 da2f1d2..47d1a88 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
@@ -491,6 +491,11 @@
//淇濆瓨鎻愪氦
function submit() {
+ console.log(curCheckData)
+ if (!curCheckData.sampleUser) {
+ layer.alert("璇峰厛鎵︽牱锛侊紒");
+ return;
+ }
if (curCheckData.checkStatus == "NONE" || curCheckData.checkStatus == "NONE2") {
layer.alert("璇风‘璁ゅ寲楠岀粨鏋滐紒锛�");
return;
@@ -501,6 +506,10 @@
}
if (!curCheckData.foodLevel) {
layer.alert("璇风‘璁ょ伯椋熺瓑绾э紒锛�");
+ return;
+ }
+ if (!curCheckData.foodType) {
+ layer.alert("璇风‘璁ょ伯椋熸�ц川锛侊紒");
return;
}
if (!curCheckData.price) {
@@ -618,7 +627,7 @@
}, {
field: 'registerTime',
title: '鐧昏鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
}, {
field: 'sampleStatus',
@@ -643,12 +652,26 @@
}, {
field: 'sampleTime',
title: '鎵︽牱鏃堕棿',
- width: '15%',
+ width: '13%',
style: 'font-weight: bold'
+ }, {
+ field: 'foodType',
+ title: '绮鎬ц川',
+ width: '9%',
+ templet: function (item) {
+ var result = item.foodType;
+ $.each(listFoodType, function (index, data) {
+ if (item.foodType == data.code) {
+ result = data.name;
+ return true;
+ }
+ });
+ return result == null ? "" : result;
+ }
}, {
field: 'foodVariety',
title: '绮鍝佺',
- width: '11%',
+ width: '9%',
templet: function (item) {
var result = item.foodVariety;
$.each(listFoodVariety, function (index, data) {
@@ -662,7 +685,7 @@
}, {
field: 'depotId',
title: '瑁呭嵏浠撳簱',
- width: '11%',
+ width: '10%',
templet: function (item) {
var result = item.depotId;
$.each(listDepot, function (index, 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 144956c..dbc2da0 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
@@ -350,6 +350,8 @@
var companyId = [[${loginUser.companyId}]];
//鍝佺
var listFoodVariety = [[${listFoodVariety}]];
+ //鎬ц川
+ var listFoodType = [[${listFoodType}]];
var startTime = [[${startTime}]];
var endTime = [[${endTime}]];
var foodYear = [[${foodYear}]];
@@ -515,25 +517,19 @@
</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" placeholder="璇疯緭鍏�"-->
- <!-- class="layui-input rkbk-search-input bg-date" id="foodYear">-->
-
- <!-- </div>-->
- <!-- </div>-->
- <!-- </div>-->
<div class="layui-col-xs4">
<div class="layui-form-item">
- <label class="layui-form-label">澶囨敞璇存槑</label>
+ <label class="layui-form-label red">绮鎬ц川</label>
<div class="layui-input-block">
- <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
- class="layui-input">
+ <select id="foodType" name="foodType" lay-filter="select_foodType">
+ <option value=""></option>
+ <option th:each="dic,dicSet:${listFoodType}"
+ th:value="${dic.code}" th:text="${dic.name}"></option>
+ </select>
</div>
</div>
</div>
+
<div class="layui-col-xs4">
<div class="layui-form-item">
<label class="layui-form-label red">鍖栭獙缁撴灉</label>
@@ -546,6 +542,15 @@
</div>
</div>
</div>
+ <div class="layui-col-xs12">
+ <div class="layui-form-item">
+ <label class="layui-form-label">澶囨敞璇存槑</label>
+ <div class="layui-input-block">
+ <input type="text" name="remarks" placeholder="璇疯緭鍏ュ唴瀹�"
+ class="layui-input">
+ </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>
--
Gitblit v1.9.3