From 34580ceb745eaeaf6f8a6188a779c0746a23b02d Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 04 九月 2025 23:18:33 +0800
Subject: [PATCH] art: 热处理入库相关接口
---
src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java | 2
db/双林新火炬MES数据库设计.pdma.json | 24 +++
src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java | 6
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java | 2
src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java | 1
src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java | 289 +++++++++++++++++++++-------------------
src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml | 7 +
src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java | 19 +-
src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java | 9 +
src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java | 13 +
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java | 11 +
src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java | 5
src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java | 13 +
src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java | 10 +
14 files changed, 256 insertions(+), 155 deletions(-)
diff --git "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json" "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
index ccd4bc8..a67d620 100644
--- "a/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
+++ "b/db/\345\217\214\346\236\227\346\226\260\347\201\253\347\202\254MES\346\225\260\346\215\256\345\272\223\350\256\276\350\256\241.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.9.2",
"createdTime": "2025-3-10 16:38:19",
- "updatedTime": "2025-9-4 17:54:21",
+ "updatedTime": "2025-9-4 21:44:43",
"dbConns": [],
"profile": {
"default": {
@@ -61892,6 +61892,24 @@
"extProps": {},
"domain": "73FD2BAD-2358-4336-B96D-45DC897BD792",
"id": "2543E9E7-C40B-496B-AF48-D57B01A2B230"
+ },
+ {
+ "defKey": "heat_treatment_flag",
+ "defName": "鐑鐞嗘爣璇�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "7CA68F5B-F30F-4F91-9BBF-1B9A741F44AF"
}
],
"correlations": [],
@@ -62315,7 +62333,7 @@
{
"defKey": "quantity",
"defName": "鍏ュ簱鏁伴噺",
- "comment": "鐗╂枡鎷夊姩銆佺敓浜т笅绾裤�佺儹澶勭悊銆佸皬鍐呭湀銆佽皟鎷�",
+ "comment": "",
"type": "",
"len": "",
"scale": "",
@@ -62333,7 +62351,7 @@
{
"defKey": "inbound_category",
"defName": "鍏ュ簱绫诲瀷",
- "comment": "",
+ "comment": "鐗╂枡鎷夊姩銆佺敓浜т笅绾裤�佺儹澶勭悊銆佸皬鍐呭湀銆佽皟鎷�",
"type": "",
"len": "",
"scale": "",
diff --git a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
index 0f5d3c9..b52a108 100644
--- a/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
+++ b/src/main/java/org/jeecg/modules/base/controller/LineSideWarehouseController.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.base.controller;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -9,6 +10,7 @@
import java.net.URLDecoder;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.query.QueryGenerator;
@@ -38,126 +40,126 @@
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 绾胯竟浠撳簱淇℃伅
* @Author: jeecg-boot
- * @Date: 2025-06-24
+ * @Date: 2025-06-24
* @Version: V1.0
*/
-@Api(tags="绾胯竟浠撳簱淇℃伅")
+@Api(tags = "绾胯竟浠撳簱淇℃伅")
@RestController
@RequestMapping("/base/lineSideWarehouse")
@Slf4j
public class LineSideWarehouseController extends JeecgController<LineSideWarehouse, ILineSideWarehouseService> {
- @Autowired
- private ILineSideWarehouseService lineSideWarehouseService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param lineSideWarehouse
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<LineSideWarehouse>> queryPageList(LineSideWarehouse lineSideWarehouse,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<LineSideWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(lineSideWarehouse, req.getParameterMap());
- Page<LineSideWarehouse> page = new Page<LineSideWarehouse>(pageNo, pageSize);
- IPage<LineSideWarehouse> pageList = lineSideWarehouseService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param lineSideWarehouse
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-娣诲姞")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-娣诲姞", notes="绾胯竟浠撳簱淇℃伅-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
- lineSideWarehouseService.save(lineSideWarehouse);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param lineSideWarehouse
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-缂栬緫", notes="绾胯竟浠撳簱淇℃伅-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody LineSideWarehouse lineSideWarehouse) {
- lineSideWarehouseService.updateById(lineSideWarehouse);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- lineSideWarehouseService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎", notes="绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.lineSideWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<LineSideWarehouse> queryById(@RequestParam(name="id",required=true) String id) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
- if(lineSideWarehouse==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(lineSideWarehouse);
- }
+ @Autowired
+ private ILineSideWarehouseService lineSideWarehouseService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param lineSideWarehouse
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param lineSideWarehouse
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<LineSideWarehouse>> queryPageList(LineSideWarehouse lineSideWarehouse,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<LineSideWarehouse> queryWrapper = QueryGenerator.initQueryWrapper(lineSideWarehouse, req.getParameterMap());
+ Page<LineSideWarehouse> page = new Page<LineSideWarehouse>(pageNo, pageSize);
+ IPage<LineSideWarehouse> pageList = lineSideWarehouseService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-娣诲姞")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-娣诲姞", notes = "绾胯竟浠撳簱淇℃伅-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
+ lineSideWarehouseService.save(lineSideWarehouse);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param lineSideWarehouse
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-缂栬緫", notes = "绾胯竟浠撳簱淇℃伅-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody LineSideWarehouse lineSideWarehouse) {
+ lineSideWarehouseService.updateById(lineSideWarehouse);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ lineSideWarehouseService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎", notes = "绾胯竟浠撳簱淇℃伅-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.lineSideWarehouseService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<LineSideWarehouse> queryById(@RequestParam(name = "id", required = true) String id) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
+ if (lineSideWarehouse == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param lineSideWarehouse
+ */
//@RequiresPermissions("org.jeecg.modules:base_line_side_warehouse:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, LineSideWarehouse lineSideWarehouse) {
@@ -165,42 +167,51 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("base_line_side_warehouse:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, LineSideWarehouse.class);
}
- @AutoLog(value = "绾胯竟搴�-鍚敤&绂佺敤")
- @ApiOperation(value = "绾胯竟搴�-鍚敤&绂佺敤", notes = "绾胯竟搴�-鍚敤&绂佺敤")
- @PutMapping(value = "/active")
- public Result<?> active(@RequestParam(name = "id", required = true) String id) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
- if (CommonConstant.STATUS_1.equals(lineSideWarehouse.getWarehouseStatus())) {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_0);
- } else {
- lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
- }
- lineSideWarehouseService.updateById(lineSideWarehouse);
- return Result.ok("鎿嶄綔鎴愬姛锛�");
- }
+ @AutoLog(value = "绾胯竟搴�-鍚敤&绂佺敤")
+ @ApiOperation(value = "绾胯竟搴�-鍚敤&绂佺敤", notes = "绾胯竟搴�-鍚敤&绂佺敤")
+ @PutMapping(value = "/active")
+ public Result<?> active(@RequestParam(name = "id", required = true) String id) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.getById(id);
+ if (CommonConstant.STATUS_1.equals(lineSideWarehouse.getWarehouseStatus())) {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_0);
+ } else {
+ lineSideWarehouse.setWarehouseStatus(CommonConstant.STATUS_1);
+ }
+ lineSideWarehouseService.updateById(lineSideWarehouse);
+ return Result.ok("鎿嶄綔鎴愬姛锛�");
+ }
- //@AutoLog(value = "绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @ApiOperation(value="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ", notes="绾胯竟浠撳簱淇℃伅-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryByFactoryId")
- public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name="factoryId") String factoryId) {
- LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
- if(lineSideWarehouse==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(lineSideWarehouse);
- }
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎ID鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎ID鏌ヨ")
+ @GetMapping(value = "/queryByFactoryId")
+ public Result<LineSideWarehouse> queryByFactoryId(@RequestParam(name = "factoryId") String factoryId) {
+ LineSideWarehouse lineSideWarehouse = lineSideWarehouseService.queryByFactoryId(factoryId);
+ if (lineSideWarehouse == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(lineSideWarehouse);
+ }
+
+ @ApiOperation(value = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎鍒嗙被鏌ヨ", notes = "绾胯竟浠撳簱淇℃伅-閫氳繃浜х嚎鍒嗙被鏌ヨ")
+ @GetMapping(value = "/queryByProductionType")
+ public Result<List<LineSideWarehouse>> queryByProductionType(@RequestParam(name = "productionType") String productionType) {
+ List<LineSideWarehouse> list = lineSideWarehouseService.queryByProductionType(productionType);
+ if (list == null) {
+ return Result.OK(Collections.emptyList());
+ }
+ return Result.OK(list);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
index 66d46d2..da727ba 100644
--- a/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
+++ b/src/main/java/org/jeecg/modules/base/entity/LineSideWarehouse.java
@@ -1,23 +1,22 @@
package org.jeecg.modules.base.entity;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.Date;
-import java.math.BigDecimal;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import lombok.Data;
+import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
-import org.jeecg.common.constant.CommonConstant;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.jeecg.common.aspect.annotation.Dict;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
/**
* @Description: 绾胯竟浠撳簱淇℃伅
diff --git a/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java b/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java
index c1efcb8..b72bfe0 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java
+++ b/src/main/java/org/jeecg/modules/base/mapper/LineSideWarehouseMapper.java
@@ -14,4 +14,10 @@
*/
public interface LineSideWarehouseMapper extends BaseMapper<LineSideWarehouse> {
+ /**
+ * 閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴�
+ * @param types
+ * @return
+ */
+ List<LineSideWarehouse> queryByProductionType(@Param("types") String[] types);
}
diff --git a/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml b/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
index 87ff328..5ea4d98 100644
--- a/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
+++ b/src/main/java/org/jeecg/modules/base/mapper/xml/LineSideWarehouseMapper.xml
@@ -2,4 +2,11 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.base.mapper.LineSideWarehouseMapper">
+ <select id="queryByProductionType" resultType="org.jeecg.modules.base.entity.LineSideWarehouse">
+ select t1.* from base_line_side_warehouse t1
+ left join base_factory t2 on t1.factory_id = t2.id
+ where t1.del_flag='0' and t1.warehouse_status='1' and
+ <foreach collection="types" item="item" open=" t2.production_type IN (" close=")" separator=",">#{item}</foreach>
+ order by t1.warehouse_code
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java b/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java
index 5d89f62..424f699 100644
--- a/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java
+++ b/src/main/java/org/jeecg/modules/base/service/ILineSideWarehouseService.java
@@ -3,6 +3,8 @@
import org.jeecg.modules.base.entity.LineSideWarehouse;
import com.baomidou.mybatisplus.extension.service.IService;
+import java.util.List;
+
/**
* @Description: 绾胯竟浠撳簱淇℃伅
* @Author: jeecg-boot
@@ -17,4 +19,11 @@
* @return
*/
LineSideWarehouse queryByFactoryId(String factoryId);
+
+ /**
+ * 鏍规嵁浜х嚎绫诲瀷鏌ヨ绾胯竟搴�
+ * @param productionType
+ * @return
+ */
+ List<LineSideWarehouse> queryByProductionType(String productionType);
}
diff --git a/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java b/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java
index 8b205e9..05dbe9e 100644
--- a/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/base/service/impl/LineSideWarehouseServiceImpl.java
@@ -2,10 +2,14 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.mapper.LineSideWarehouseMapper;
import org.jeecg.modules.base.service.ILineSideWarehouseService;
import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
/**
* @Description: 绾胯竟浠撳簱淇℃伅
@@ -26,4 +30,13 @@
}
return entity;
}
+
+ @Override
+ public List<LineSideWarehouse> queryByProductionType(String productionType) {
+ if(StringUtils.isBlank(productionType)) {
+ return Collections.emptyList();
+ }
+ String[] types = productionType.split(",");
+ return this.getBaseMapper().queryByProductionType(types);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
index 40bf0cb..5eac9ed 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java
@@ -126,7 +126,6 @@
}
- @AutoLog(value = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�")
@ApiOperation(value = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�", notes = "绾胯竟搴撶墿鏂欎俊鎭�-閫氳繃浜х嚎绫诲瀷鏌ヨ绾胯竟搴撶墿鏂�")
@GetMapping(value = "/queryLswMaterialByProductionType")
public Result<List<LswMaterial>> queryLswMaterialByProductionType(@RequestParam("factoryId") String factoryId) {
@@ -164,4 +163,16 @@
}
return Result.OK(lswMaterialList);
}
+
+ @ApiOperation(value = "绾胯竟搴撶墿鏂欎俊鎭�-鏍规嵁鐗╂枡绫诲瀷鏌ヨ", notes = "绾胯竟搴撶墿鏂欎俊鎭�-鏍规嵁鐗╂枡绫诲瀷鏌ヨ")
+ @GetMapping(value = "/queryByMaterialCategory")
+ public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
+ LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(LswMaterial::getMaterialCategory, materialCategory);
+ queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
+ queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
+ queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);
+ List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
+ return Result.ok(lswMaterialList);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java
index 003adb1..109e761 100644
--- a/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java
+++ b/src/main/java/org/jeecg/modules/lsw/controller/LswMaterialInboundController.java
@@ -30,7 +30,7 @@
*/
@Api(tags="鐗╂枡鍏ュ簱鍗�")
@RestController
-@RequestMapping("/lswmaterialinbound/lswMaterialInbound")
+@RequestMapping("/lsw/materialInbound")
@Slf4j
public class LswMaterialInboundController extends JeecgController<LswMaterialInbound, ILswMaterialInboundService> {
@Autowired
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
index cf383c6..406e7ad 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterial.java
@@ -6,7 +6,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
-import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
index 8827025..fa2e9ae 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInbound.java
@@ -57,6 +57,12 @@
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
+ @Excel(name = "鏉ユ簮缂栫爜", width = 15)
+ @ApiModelProperty(value = "鏉ユ簮缂栫爜")
+ private String originalCode;
+ @Excel(name = "鏉ユ簮鍚嶇О", width = 15)
+ @ApiModelProperty(value = "鏉ユ簮鍚嶇О")
+ private String originalName;
/**浜х嚎ID*/
@Excel(name = "浜х嚎ID", width = 15)
@ApiModelProperty(value = "浜х嚎ID")
@@ -83,6 +89,11 @@
@Excel(name = "鍏ュ簱鏁伴噺", width = 15)
@ApiModelProperty(value = "鍏ュ簱鏁伴噺")
private BigDecimal quantity;
+ /**鍏ュ簱绫诲瀷*/
+ @Excel(name = "鍏ュ簱绫诲瀷", width = 15)
+ @ApiModelProperty(value = "鍏ュ簱绫诲瀷")
+ @Dict(dicCode = "material_inbound_category")
+ private String inboundCategory;
/**鎺ユ敹浜�*/
@Excel(name = "鎺ユ敹浜�", width = 15)
@ApiModelProperty(value = "鎺ユ敹浜�")
diff --git a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
index 3d2a8ba..2e7e017 100644
--- a/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
+++ b/src/main/java/org/jeecg/modules/lsw/entity/LswMaterialInventory.java
@@ -9,6 +9,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.lsw.enums.MaterialInventoryStatusEnum;
import org.jeecgframework.poi.excel.annotation.Excel;
import org.springframework.format.annotation.DateTimeFormat;
@@ -76,6 +77,10 @@
@ApiModelProperty(value = "搴撳瓨鐘舵��")
@Dict(dicCode = "material_inventory_status")
private String inventoryStatus;
+ /**鐑鐞嗘爣璇�*/
+ @Excel(name = "鐑鐞嗘爣璇�", width = 15)
+ @ApiModelProperty(value = "鐑鐞嗘爣璇�")
+ private String heatTreatmentFlag = CommonConstant.STATUS_0;
public LswMaterialInventory(){}
diff --git a/src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java b/src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java
index 6037d5d..5595078 100644
--- a/src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java
+++ b/src/main/java/org/jeecg/modules/lsw/enums/MaterialCategoryEnum.java
@@ -4,6 +4,8 @@
FINISHED_PRODUCT, //鎴愬搧
OUTER_FLANGE, //澶栨硶鍏�
INNER_FLANGE, //鍐呮硶鍏�
+ SMALL_INNER_RING, //灏忓唴鍦�
+ STEEL_BALL, //閽㈢悆
COMPONENTS, //閰嶄欢
BLANK; //姣涘澂
diff --git a/src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java b/src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java
new file mode 100644
index 0000000..1433420
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/lsw/enums/MaterialInboundCategory.java
@@ -0,0 +1,10 @@
+package org.jeecg.modules.lsw.enums;
+
+public enum MaterialInboundCategory {
+ MATERIAL_TRANSFER_REQUEST, //鐗╂枡鎷夊姩
+ PRODUCTION_INBOUND,//鐢熶骇涓嬬嚎
+ HEAT_TREATMENT_INBOUND,//鐑鐞�
+ SMALL_INNER_RING,//灏忓唴鍦�
+ MATERIAL_INNER_TRANSFER //鍐呴儴璋冩嫧
+ ;
+}
--
Gitblit v1.9.3