From 4d542200ffc5757be75bb3868155a6d62eab88a5 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期一, 26 五月 2025 16:31:46 +0800
Subject: [PATCH] 工具入库
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java | 11 ++---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml | 37 ++++++++++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java | 8 ++-
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IInStoreDetailService.java | 6 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java | 31 +++++++++++++++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java | 5 +-
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/InStoreDetailMapper.java | 6 +++
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml | 5 ++
8 files changed, 96 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java
index 7a7f587..1a80548 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/InStoreDetailController.java
@@ -13,6 +13,7 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.tms.entity.InStoreDetail;
+import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.service.IInStoreDetailService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -56,19 +57,17 @@
* @param inStoreDetail
* @param pageNo
* @param pageSize
- * @param req
+ * @param query
* @return
*/
//@AutoLog(value = "鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
@ApiOperation(value="鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="鍏ュ簱鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
@GetMapping(value = "/list")
- public Result<IPage<InStoreDetail>> queryPageList(InStoreDetail inStoreDetail,
+ public Result<?> findPageList(InStoreDetail inStoreDetail,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<InStoreDetail> queryWrapper = QueryGenerator.initQueryWrapper(inStoreDetail, req.getParameterMap());
- Page<InStoreDetail> page = new Page<InStoreDetail>(pageNo, pageSize);
- IPage<InStoreDetail> pageList = inStoreDetailService.page(page, queryWrapper);
+ @RequestParam Map<String, String> query) {
+ IPage<Map<String, Object>> pageList = inStoreDetailService.findPageList(pageNo, pageSize, query);
return Result.OK(pageList);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
index 1164ab7..1239559 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/entity/InStoreDetail.java
@@ -44,9 +44,10 @@
@Excel(name = "宸ュ叿缂栧彿", width = 15)
@ApiModelProperty(value = "宸ュ叿缂栧彿")
private String toolId;
- /**宸ュ叿鍏ュ簱鏂瑰紡*/
- @Excel(name = "宸ュ叿鍏ュ簱鏂瑰紡", width = 15)
- @ApiModelProperty(value = "宸ュ叿鍏ュ簱鏂瑰紡")
+ /**宸ュ叿鍏ュ簱绫诲瀷*/
+ @Excel(name = "宸ュ叿鍏ュ簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "宸ュ叿鍏ュ簱绫诲瀷")
+ @Dict(dicCode = "in_storehouse_type")
private String inStorehouseType;
/**搴撲綅鍙�*/
@Excel(name = "搴撲綅鍙�", width = 15)
@@ -64,6 +65,7 @@
2.鎵嬪伐鎿嶄綔*/
@Excel(name = "鍏ュ簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔", width = 15)
@ApiModelProperty(value = "鍏ュ簱鎿嶄綔鏂瑰紡;1.鎸夌敵璇峰崟 2.鎵嬪伐鎿嶄綔")
+ @Dict(dicCode = "inbound_operate_type")
private java.lang.String operateType;
/**鍏ュ簱鏃堕棿*/
@Excel(name = "鍏ュ簱鏃堕棿", width = 15, format = "yyyy-MM-dd")
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/InStoreDetailMapper.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/InStoreDetailMapper.java
index 97177f1..84926f4 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/InStoreDetailMapper.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/InStoreDetailMapper.java
@@ -1,7 +1,12 @@
package org.jeecg.modules.tms.mapper;
import java.util.List;
+import java.util.Map;
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.tms.entity.InStoreDetail;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -14,4 +19,5 @@
*/
public interface InStoreDetailMapper extends BaseMapper<InStoreDetail> {
+ public IPage<Map<String, Object>> findPageList(IPage<Map> pageData, @Param(Constants.WRAPPER) Wrapper<Map> wrapper);
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
index d062ac9..79cf799 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InStoreDetailMapper.xml
@@ -2,4 +2,41 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.tms.mapper.InStoreDetailMapper">
+ <select id="queryPageList" resultType="map" parameterType="String">
+ SELECT
+ t.id,
+ t.tool_id onlyCode,
+ t.in_storehouse_type inStorehouseType,
+ t.goods_shelves_id goodsShelvesId,
+ t.in_number inNumber,
+ t.in_storehouse_id inStorehouseId,
+ t.inbound_time inboundTime,
+ t.create_by createBy,
+ t.create_time createTime,
+ t.update_by updateBy,
+ t.update_time updateTime,
+ t1.tool_code toolCode,
+ t1.chinese_name chineseName,
+ t1.tool_model toolModel,
+ t2.classify_id classifyNum,
+ t3.inbound_num inboundNum,
+ t3.application_reason applicationReason,
+ t3.approval_date approvalDate,
+ t3.approval_opinion approvalOpinion,
+ t4.item_text operateType,
+ t5.realname handler,
+ t6.realname reviewer,
+ t7.item_value inStatus,
+ t8.item_value orderStatus
+ FROM tms_in_store_detail t
+ LEFT JOIN tms_base_tools t1 on t.tool_code = t1.id
+ LEFT JOIN tms_tools_classify t2 on t2.id = t1.classify_id
+ LEFT JOIN tms_inbound_order t3 on t3.id = t.in_storehouse_id
+ LEFT JOIN (select * from v_sys_dict where dict_code='inbound_operate_type') t4 on t4.item_value = t.operate_type
+ LEFT JOIN sys_user t5 on t5.username = t3.handler
+ LEFT JOIN sys_user t6 on t6.username = t3.reviewer
+ LEFT JOIN (select * from v_sys_dict where dict_code='in_status') t7 on t7.item_value = t3.in_status
+ LEFT JOIN (select * from v_sys_dict where dict_code='in_bill_status') t8 on t8.item_value = t3.order_status
+ ${ew.customSqlSegment}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
index 4ef950a..49ef0c6 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/mapper/xml/InboundDetailMapper.xml
@@ -7,15 +7,18 @@
t1.id,
t3.id toolCodeId,
t1.in_storage_quantity inStorageQuantity,
+ t1.in_actual_count inActualCount,
t3.tool_code toolCode,
t3.chinese_name chineseName,
t3.tool_model toolModel,
- t5.item_text applicationType
+ t5.item_text applicationType,
+ t6.classify_id classifyNum
from tms_inbound_detail t1
left join tms_inbound_order t2 on t1.in_storehouse_id = t2.id
left join tms_base_tools t3 on t3.id = t1.tool_code
left join tms_tools_config_property t4 on t4.tool_code = t1.tool_code
left join (select * from v_sys_dict where dict_code = 'application_type') t5 on t5.item_value = t4.application_type
+ left join tms_tools_classify t6 on t6.id = t3.classify_id
${ew.customSqlSegment}
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IInStoreDetailService.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IInStoreDetailService.java
index 625733c..fbf6b9d 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IInStoreDetailService.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/IInStoreDetailService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.tms.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.tms.entity.InStoreDetail;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.Map;
/**
* @Description: 鍏ュ簱鏄庣粏
@@ -11,4 +15,6 @@
*/
public interface IInStoreDetailService extends IService<InStoreDetail> {
+ IPage<Map<String, Object>> findPageList(Integer pageNo, Integer pageSize, Map<String, String> query);
+
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
index ebbce68..49fe595 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/InStoreDetailServiceImpl.java
@@ -1,11 +1,23 @@
package org.jeecg.modules.tms.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.exception.ExceptionCast;
import org.jeecg.modules.tms.entity.InStoreDetail;
+import org.jeecg.modules.tms.entity.ToolsClassify;
import org.jeecg.modules.tms.mapper.InStoreDetailMapper;
import org.jeecg.modules.tms.service.IInStoreDetailService;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @Description: 鍏ュ簱鏄庣粏
@@ -16,4 +28,23 @@
@Service
public class InStoreDetailServiceImpl extends ServiceImpl<InStoreDetailMapper, InStoreDetail> implements IInStoreDetailService {
+ @Override
+ public IPage<Map<String, Object>> findPageList(Integer pageNo, Integer pageSize, Map<String, String> query) {
+ if (pageNo == null || pageNo < 1 || pageSize == null || pageSize < 1) {
+ ExceptionCast.cast("鍙傛暟閿欒");
+ }
+ IPage<Map> pageData = new Page<Map>(pageNo, pageSize);
+ QueryWrapper<Map> queryWrapper = Wrappers.query();
+ if (null != query) {
+ String classifyId = query.get("classifyId");
+ if (StringUtils.isNotBlank(classifyId)) {
+ queryWrapper.eq("t2.id", classifyId);
+ }
+ // 鎺掑簭鍐欐硶
+ List<OrderItem> orderItems = new ArrayList<>();
+ orderItems.add(OrderItem.desc("t1.create_time"));
+ ((Page<Map>) pageData).setOrders(orderItems);
+ }
+ return super.getBaseMapper().findPageList(pageData,queryWrapper);
+ }
}
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
index d19e690..cee90e8 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/service/impl/ToolsClassifyServiceImpl.java
@@ -87,7 +87,6 @@
@SuppressWarnings("unused") ToolsClassify toolsClassify = new ToolsClassify();
List<CommonGenericTree> list = new ArrayList<>();
Map<String, CommonGenericTree> map = new HashMap<>();
- CommonGenericTree<ToolsClassify> node = new CommonGenericTree<>();
if (CollectionUtils.isNotEmpty(toolsClassifyList)) {
CommonGenericTree<ToolsClassify> tcNode;
CommonGenericTree<ToolsClassify> childNode;
@@ -102,7 +101,7 @@
tcNode.setValue(tc.getId());
tcNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
tcNode.setRField1(tc.getClassifyId());
- tcNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
+ //tcNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
tcNode.setEntity(tc);
list.add(tcNode);
map.put(tc.getId(), tcNode);
@@ -117,7 +116,7 @@
childNode.setValue(tc.getId());
childNode.setDisabled(CommonConstant.STATUS_0.equals(tc.getStatus()) ? true : false);
childNode.setRField1(tc.getClassifyId());
- childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
+ //childNode.setRField2(getBaseParent(tc.getId(), 0).getClassifyId());
childNode.setEntity(tc);
tcNode.addChildren(childNode);
map.put(child.getId(), childNode);
--
Gitblit v1.9.3