From 9ea93abc2606948e5724316a4a3ec338ea14a130 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期一, 17 十一月 2025 13:56:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs
---
src/main/java/com/zy/asrs/entity/PlaLog.java | 4 +
src/main/java/com/zy/asrs/controller/PlaController.java | 44 ++++++++++
src/main/webapp/views/pla3/plaDetl.html | 26 ++++++
src/main/webapp/views/pla2/plaDetl.html | 26 ++++++
src/main/resources/mapper/PlaMapper.xml | 4 +
src/main/java/com/zy/asrs/entity/Pla.java | 4 +
src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java | 10 ++
src/main/webapp/static/css/common.css | 2
src/main/java/com/zy/asrs/service/PlaService.java | 3
src/main/java/com/zy/asrs/utils/PlaExcelListener.java | 1
src/main/webapp/views/pla/plaDetl.html | 21 +++++
src/main/webapp/static/js/pla/plaDetl.js | 32 ++++++++
src/main/webapp/views/operateLog/operateLog.html | 12 ++
src/main/java/com/zy/asrs/mapper/PlaMapper.java | 6 +
src/main/java/com/zy/asrs/entity/DropdownValuesDto.java | 16 ++++
15 files changed, 206 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PlaController.java b/src/main/java/com/zy/asrs/controller/PlaController.java
index f9d4513..c91151c 100644
--- a/src/main/java/com/zy/asrs/controller/PlaController.java
+++ b/src/main/java/com/zy/asrs/controller/PlaController.java
@@ -20,6 +20,8 @@
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
+import com.zy.system.entity.OperateLog;
+import com.zy.system.service.OperateLogService;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -28,10 +30,12 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
@Slf4j
@@ -53,6 +57,32 @@
private MatService matService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Resource
+ private OperateLogService operateLogService;
+
+ // 鑾峰彇涓嬫媺閫夋嫨妗嗗�煎垪琛�
+ @GetMapping(value = "/pla/dropdownValues/list")
+ @ManagerAuth
+ public R list() {
+ List<DropdownValuesDto> list = plaService.getDropdownValues();
+ Map<String, List<String>> map = new HashMap<>();
+
+ // owner 鍘婚噸骞跺姞鍏� map
+ List<String> owners = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("owner"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("owner", owners);
+
+ // workshop 鍘婚噸骞跺姞鍏� map
+ List<String> workshops = list.stream()
+ .filter(dropdownValuesDto -> dropdownValuesDto.getType().equals("workshop"))
+ .map(DropdownValuesDto::getValue)
+ .collect(Collectors.toList());
+ map.put("workshop", workshops);
+ return R.ok(map);
+ }
@RequestMapping(value = "/pla/list/auth")
@@ -103,7 +133,7 @@
@RequestMapping(value = "/pla/update/auth")
@ManagerAuth
public R update(@RequestBody List<Pla> plas) {
- log.info(plas.toString());
+ Date date = new Date();
plas.forEach(pla -> {
Pla plaSave = plaService.selectById(pla.getId());
pla.setModifyTime(new Date());
@@ -112,10 +142,20 @@
PlaLog plaLog = new PlaLog();
BeanUtils.copyProperties(plaSave, plaLog);
plaLog.setId(null);
- plaLog.setCreateTime(new Date());
+ plaLog.setCreateTime(date);
plaLog.setModifyUser(getUser().getUsername());
plaLogService.insert(plaLog);
+ // 璁板綍鎿嶄綔鏃ュ織
+ OperateLog operateLog = new OperateLog();
+ operateLog.setAction("鑱氫钩閰稿簱瀛樻槑缁嗕慨鏀�");
+ operateLog.setUserId(getUserId());
+ operateLog.setIp(request.getRemoteAddr());
+ operateLog.setRequest(pla.toString());
+ operateLog.setResponse(plaSave.toString());
+ operateLog.setCreateTime(new Date());
+ operateLogService.insert(operateLog);
+
});
return R.ok();
}
diff --git a/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java b/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java
new file mode 100644
index 0000000..f1fac36
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/DropdownValuesDto.java
@@ -0,0 +1,16 @@
+package com.zy.asrs.entity;
+
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description 涓嬫媺閫夋嫨妗嗗�奸�氱敤瑙嗗浘
+ * @createDate 2025/10/23 13:36
+ */
+@Data
+public class DropdownValuesDto {
+
+ private String type;
+
+ private String value;
+}
diff --git a/src/main/java/com/zy/asrs/entity/Pla.java b/src/main/java/com/zy/asrs/entity/Pla.java
index 55dc517..cb0f6e7 100644
--- a/src/main/java/com/zy/asrs/entity/Pla.java
+++ b/src/main/java/com/zy/asrs/entity/Pla.java
@@ -149,6 +149,10 @@
@ExcelProperty(value = "涓嶉�忔槑搴�,%")
private Double opacity;
+ @TableField("lactide_content")
+ @ExcelProperty(value = "涓欎氦閰惈閲�,%")
+ private Double lactideContent;
+
//L鍊�
@TableField("l")
@ExcelProperty(value = "L*")
diff --git a/src/main/java/com/zy/asrs/entity/PlaLog.java b/src/main/java/com/zy/asrs/entity/PlaLog.java
index c6bc5a0..7a02c6e 100644
--- a/src/main/java/com/zy/asrs/entity/PlaLog.java
+++ b/src/main/java/com/zy/asrs/entity/PlaLog.java
@@ -236,6 +236,10 @@
@TableField("memo")
private String memo;
+ @TableField("lactide_content")
+ @ExcelProperty(value = "涓欎氦閰惈閲�,%")
+ private Double lactideContent;
+
public String getPakinTime$() {
if (Cools.isEmpty(this.pakinTime)){
return "";
diff --git a/src/main/java/com/zy/asrs/mapper/PlaMapper.java b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
index f6c4c13..30ea888 100644
--- a/src/main/java/com/zy/asrs/mapper/PlaMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/PlaMapper.java
@@ -1,6 +1,7 @@
package com.zy.asrs.mapper;
import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.Pla;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -26,6 +27,11 @@
Integer getStockStatisCountAll(Map<String, Object> map);
/**
+ * 鑾峰彇涓嬫媺鍒楄〃鍊�
+ */
+ List<DropdownValuesDto> getDropdownValues();
+
+ /**
* 鑷姩瑙ｅ喕鍐荤粨鏃堕棿瓒呰繃90澶╃殑搴撳瓨
* @return 鏇存柊鏁伴噺
*/
diff --git a/src/main/java/com/zy/asrs/service/PlaService.java b/src/main/java/com/zy/asrs/service/PlaService.java
index ea13b76..7caee55 100644
--- a/src/main/java/com/zy/asrs/service/PlaService.java
+++ b/src/main/java/com/zy/asrs/service/PlaService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.baomidou.mybatisplus.service.IService;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -11,6 +12,8 @@
public interface PlaService extends IService<Pla> {
+ List<DropdownValuesDto> getDropdownValues();
+
Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand);
void queryStock(OrderDetl orderDetl, List<PlaQty> plaQties);
diff --git a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
index 9eb8ebe..401a7c2 100644
--- a/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.DropdownValuesDto;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.Pla;
import com.zy.asrs.entity.PlaQty;
@@ -21,6 +22,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -29,6 +31,14 @@
@Autowired
private PlaQtyService plaQtyService;
+ @Resource
+ private PlaMapper plaMapper;
+
+ @Override
+ public List<DropdownValuesDto> getDropdownValues() {
+ return plaMapper.getDropdownValues();
+ }
+
public Pla selectByBatchAndPackageNo(String batch, Integer packageNo, String brand) {
return this.selectOne(new EntityWrapper<Pla>().eq("batch",batch).eq("package_no",packageNo).eq("brand",brand));
}
diff --git a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
index b36cf1a..568bae8 100644
--- a/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/PlaExcelListener.java
@@ -120,6 +120,7 @@
pla.setVadf2(excel.getVadf2());
pla.setYellowness(excel.getYellowness());
pla.setOpacity(excel.getOpacity());
+ pla.setLactideContent(excel.getLactideContent());
pla.setL(excel.getL());
pla.setA(excel.getA());
pla.setB(excel.getB());
diff --git a/src/main/resources/mapper/PlaMapper.xml b/src/main/resources/mapper/PlaMapper.xml
index ea2d216..561079f 100644
--- a/src/main/resources/mapper/PlaMapper.xml
+++ b/src/main/resources/mapper/PlaMapper.xml
@@ -43,4 +43,8 @@
</where>
GROUP BY brand,matnr,workshop HAVING SUM(weight_anfme) > 0 ORDER BY matnr,workshop
</select>
+ <select id="getDropdownValues" resultType="com.zy.asrs.entity.DropdownValuesDto">
+ SELECT type, value
+ FROM dropdown_values_view
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/webapp/static/css/common.css b/src/main/webapp/static/css/common.css
index 0b78660..55d4c0d 100644
--- a/src/main/webapp/static/css/common.css
+++ b/src/main/webapp/static/css/common.css
@@ -88,7 +88,7 @@
text-align: center;
}
div .layui-table-tool .layui-table-tool-self .layui-inline[title='瀵煎嚭']{
- display: none;
+ /*display: none;*/
}
.layui-form.layui-border-box.layui-table-view{
margin: 15px 0 35px 0;
diff --git a/src/main/webapp/static/js/pla/plaDetl.js b/src/main/webapp/static/js/pla/plaDetl.js
index 5362faa..57e768e 100644
--- a/src/main/webapp/static/js/pla/plaDetl.js
+++ b/src/main/webapp/static/js/pla/plaDetl.js
@@ -29,6 +29,7 @@
,{field: 'vadf2', align: 'center',title: '鍒嗚В娈碉紝%', hide:true,edit:true}
,{field: 'yellowness', align: 'center',title: '榛勫害',edit:true}
,{field: 'opacity', align: 'center',title: '涓嶉�忔槑搴︼紝%',edit:true}
+ ,{field: 'lactideContent', align: 'center',title: '涓欎氦閰惈閲忥紝%',edit:true}
,{field: 'l', align: 'center',title: 'L*', hide:true,edit:true}
,{field: 'a', align: 'center',title: 'a*', hide:true,edit:true}
,{field: 'b', align: 'center',title: 'b*', hide:true,edit:true}
@@ -103,6 +104,33 @@
laydate = layui.laydate;
var form = layui.form;
admin = layui.admin;
+
+ // 妯℃嫙浠庡悗绔帴鍙ｈ幏鍙栨暟鎹�
+ $.ajax({
+ url: baseUrl + "/pla/dropdownValues/list",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ var data = res.data
+
+ if (data.owner && Array.isArray(data.owner)) {
+ data.owner.forEach(function(item) {
+ $('#ownerSelect').append(new Option(item, item));
+ });
+ }
+
+ if (data.workshop && Array.isArray(data.workshop)) {
+ data.workshop.forEach(function(item) {
+ $('#workshopSelect').append(new Option(item, item));
+ });
+ }
+
+ // 閲嶆柊娓叉煋 LayUI 琛ㄥ崟
+ form.render('select');
+ }
+ }
+ });
// 鏃ユ湡鏃堕棿鑼冨洿
laydate.render({
@@ -826,6 +854,10 @@
var iframe = window['layui-layer-iframe' + index];
iframe.child(dataSave)
+ },
+ end: function() {
+ // 鉁� 瀛愰〉闈㈠叧闂椂鍒锋柊琛ㄦ牸
+ tableReload(false); // 鎴栨牴鎹疄闄呮儏鍐典紶 true/false
}
});
})
diff --git a/src/main/webapp/views/operateLog/operateLog.html b/src/main/webapp/views/operateLog/operateLog.html
index 827ece5..48627b8 100644
--- a/src/main/webapp/views/operateLog/operateLog.html
+++ b/src/main/webapp/views/operateLog/operateLog.html
@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="id" placeholder="缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="action" placeholder="鎿嶄綔鍐呭" autocomplete="off">
</div>
</div>
<div class="layui-inline">
@@ -30,6 +30,16 @@
</div>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="request" placeholder="璇锋眰鏁版嵁" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="response" placeholder="杩斿洖鏁版嵁" autocomplete="off">
+ </div>
+ </div>
<!-- 鏃ユ湡鑼冨洿 -->
<div class="layui-inline" style="width: 300px">
<div class="layui-input-inline">
diff --git a/src/main/webapp/views/pla/plaDetl.html b/src/main/webapp/views/pla/plaDetl.html
index de42122..e4d443f 100644
--- a/src/main/webapp/views/pla/plaDetl.html
+++ b/src/main/webapp/views/pla/plaDetl.html
@@ -304,7 +304,16 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="owner" placeholder="涓讳綋" autocomplete="off">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -320,6 +329,16 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�灏忎笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�澶т笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
</div>
</div>
diff --git a/src/main/webapp/views/pla2/plaDetl.html b/src/main/webapp/views/pla2/plaDetl.html
index 7497875..69de4d5 100644
--- a/src/main/webapp/views/pla2/plaDetl.html
+++ b/src/main/webapp/views/pla2/plaDetl.html
@@ -296,6 +296,32 @@
</div>
</div>
</div>
+ <div class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�灏忎笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�澶т笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
+ </div>
</div>
<script type="text/html" id="toolbar">
diff --git a/src/main/webapp/views/pla3/plaDetl.html b/src/main/webapp/views/pla3/plaDetl.html
index 72e37dc..af96acf 100644
--- a/src/main/webapp/views/pla3/plaDetl.html
+++ b/src/main/webapp/views/pla3/plaDetl.html
@@ -296,6 +296,32 @@
</div>
</div>
</div>
+ <div class="layui-form layui-card-header">
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="ownerSelect" name="owner" lay-search>
+ <option value="">涓讳綋</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <select id="workshopSelect" name="workshop" lay-search>
+ <option value="">杞﹂棿</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�灏忎笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="lactide_contentMax" placeholder="鏈�澶т笝浜ら叝" autocomplete="off">
+ </div>
+ </div>
+ </div>
</div>
<script type="text/html" id="toolbar">
--
Gitblit v1.9.1