From 8b874a8b39dc8c5244e7615498af9b5f8d2d9427 Mon Sep 17 00:00:00 2001 From: YYC <1833023622@qq.com> Date: 星期六, 08 七月 2023 18:32:07 +0800 Subject: [PATCH] 添加粮食年份 --- igds-web/src/main/resources/static/admin/inout/in-check.js | 7 ++ igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java | 2 igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 122 +++++++++++++++++++++------------------- igds-web/src/main/resources/templates/admin/inout/in-check.html | 22 +++++++ 4 files changed, 93 insertions(+), 60 deletions(-) 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 e41f0c0..ca05916 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 @@ -3,6 +3,7 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.ld.igds.check.dto.CheckItemData; import lombok.Data; + import java.io.Serializable; import java.util.Date; import java.util.List; @@ -16,72 +17,75 @@ @Data public class InoutCheckData implements Serializable { - private static final long serialVersionUID = 1L; + 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: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 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: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 foodYear; - /*-----鎵︽牱淇℃伅-----*/ - //鎵︽牱浜� - private String sampleUser; - //鎵︽牱鏃堕棿 - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date sampleTime; - //鎵︽牱鏂瑰紡锛�0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満 - private String sampleType; - //鎵︽牱鐘舵��()锛孨ONE-鏈墻鏍凤紝SAMPLE-宸叉墻鏍� - private String sampleStatus; + /*-----鎵︽牱淇℃伅-----*/ - /*-----鍖栭獙淇℃伅-----*/ + //鎵︽牱浜� + private String sampleUser; + //鎵︽牱鏃堕棿 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date sampleTime; + //鎵︽牱鏂瑰紡锛�0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満 + private String sampleType; + //鎵︽牱鐘舵��()锛孨ONE-鏈墻鏍凤紝SAMPLE-宸叉墻鏍� + private String sampleStatus; - //妫�楠屼汉 - private String checkUser; - //璐ㄦ鏃堕棿 - @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") - private Date checkTime; - //妫�楠岀粨鏋滐紝NONE-鏈楠岋紝PASS-宸叉楠岋紝UNPASS-涓嶅悎鏍� - private String checkStatus; - //绮瀹氱瓑 - private String foodLevel; - //璐ㄦ鎵i噸 - private double deCheck = 0.0; - //璐ㄦ澧為噸 - private double addCheck = 0.0; + /*-----鍖栭獙淇℃伅-----*/ - private String remarks; + //妫�楠屼汉 + private String checkUser; + //璐ㄦ鏃堕棿 + @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date checkTime; + //妫�楠岀粨鏋滐紝NONE-鏈楠岋紝PASS-宸叉楠岋紝UNPASS-涓嶅悎鏍� + private String checkStatus; + //绮瀹氱瓑 + private String foodLevel; + //璐ㄦ鎵i噸 + private double deCheck = 0.0; + //璐ㄦ澧為噸 + private double addCheck = 0.0; - private Date updateTime; + private String remarks; - //鍖栭獙椤规暟鎹俊鎭� - private List<CheckItemData> checkItems; + private Date updateTime; + + //鍖栭獙椤规暟鎹俊鎭� + private List<CheckItemData> checkItems; } 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 da85c44..466a756 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 @@ -841,6 +841,7 @@ data.setCheckTime(new Date()); } curData.setCheckStatus(data.getCheckStatus()); + curData.setFoodYear(data.getFoodYear()); // 鑾峰彇涓嬩竴涓祦绋嬬姸鎬� @@ -860,6 +861,7 @@ curData.setPrice(data.getPrice()); curData.setRemarks(data.getRemarks()); curData.setCheckItems(data.getCheckItems()); + curData.setCheckTime(data.getCheckTime()); if (StringUtils.isEmpty(data.getCheckUser())) { curData.setCheckUser(ContextUtil.getLoginUserCName()); 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 8a6e3fa..2d593cb 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 @@ -29,6 +29,13 @@ }); laydate.render({ + elem: '#foodYear', + theme: '#7b8e9f', + value: foodYear, + type: 'year' + }); + + laydate.render({ elem: '#checkTime', theme: '#7b8e9f', format: 'yyyy-MM-dd HH:mm:ss', 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 1bf048d..144956c 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 @@ -352,6 +352,7 @@ var listFoodVariety = [[${listFoodVariety}]]; var startTime = [[${startTime}]]; var endTime = [[${endTime}]]; + var foodYear = [[${foodYear}]]; //鎵︽牱鏈轰俊鎭� var checkDto = [[${checkDto}]]; @@ -505,7 +506,26 @@ </div> </div> </div> - <div class="layui-col-xs8"> + <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="foodYear" placeholder="璇疯緭鍏�" autocomplete="off" + 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 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> <div class="layui-input-block"> -- Gitblit v1.9.3