From 39ea8ce927e5c5cf891f2ec976ff68576096c53b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 16 八月 2025 16:23:22 +0800
Subject: [PATCH] art: 物料拉动相关代码修改
---
db/双林新火炬MES数据库设计.pdma.json | 556 ++++++++++++++-----------------------------------
/dev/null | 18 -
src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java | 2
src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java | 32 +-
4 files changed, 180 insertions(+), 428 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 18fd831..6b165cf 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-8-15 14:58:22",
+ "updatedTime": "2025-8-16 15:26:48",
"dbConns": [],
"profile": {
"default": {
@@ -64761,6 +64761,24 @@
"id": "FC8D8EFD-EDAD-42FD-81CA-B2B3962BD05F"
},
{
+ "defKey": "publish_time",
+ "defName": "鍙戝竷鏃堕棿",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098",
+ "extProps": {},
+ "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
+ "id": "7BC5A8E6-31E0-4B70-BAC5-87EFF639FE63"
+ },
+ {
"defKey": "request_status",
"defName": "璇锋眰鐘舵��",
"comment": "",
@@ -64771,7 +64789,7 @@
"notNull": false,
"autoIncrement": false,
"defaultValue": "",
- "hideInGraph": false,
+ "hideInGraph": true,
"refDict": "",
"baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
"extProps": {},
@@ -64798,7 +64816,7 @@
},
{
"defKey": "original_warehouse_id",
- "defName": "鍘熷簱瀛樺湴",
+ "defName": "璧峰搴撳瓨鍦�",
"comment": "",
"type": "",
"len": "",
@@ -64887,6 +64905,146 @@
"extProps": {},
"domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
"id": "F0CEC477-F5FE-4622-83DB-FBFDA4344E30"
+ },
+ {
+ "defKey": "material_number",
+ "defName": "鐗╂枡缂栫爜",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "0B5A2CD6-7472-4E18-ACB1-6418C2A8A109",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "material_name",
+ "defName": "鐗╂枡鍚嶇О",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "AFBDF9D2-3B49-4620-9541-C15731785905",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "specified_quantity",
+ "defName": "鐞嗚鎷夊姩鏁伴噺",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "60A2C50B-3F37-4319-B53A-72AE3E55CAFC",
+ "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E"
+ },
+ {
+ "defKey": "actual_quantity",
+ "defName": "瀹為檯鎷夊姩鏁伴噺",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "AE123111-CDE3-4CFE-96ED-EFA3D3115CD2",
+ "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E"
+ },
+ {
+ "defKey": "remaining_quantity",
+ "defName": "杞﹂棿鍓╀綑鏁伴噺",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
+ "refDict": "",
+ "extProps": {},
+ "notes": {},
+ "attr1": "",
+ "attr2": "",
+ "attr3": "",
+ "attr4": "",
+ "attr5": "",
+ "attr6": "",
+ "attr7": "",
+ "attr8": "",
+ "attr9": "",
+ "id": "12249855-7F62-4734-B5B8-1AACBE2A50CC",
+ "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E"
}
],
"correlations": [],
@@ -65725,397 +65883,6 @@
"attr9": "",
"id": "4B21EDEF-B9C4-48C7-BF6A-AC5ABA159B8A",
"baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E"
- }
- ],
- "correlations": [],
- "indexes": [],
- "type": "P"
- },
- {
- "id": "2FF92658-07FE-49BC-A690-E24FA5226BB3",
- "env": {
- "base": {
- "nameSpace": "",
- "codeRoot": ""
- }
- },
- "defKey": "mes_material_transfer_detail",
- "defName": "鐗╂枡鎷夊姩鏄庣粏",
- "comment": "",
- "properties": {
- "partitioned by": "(date string)",
- "row format delimited": "",
- "fields terminated by ','": "",
- "collection items terminated by '-'": "",
- "map keys terminated by ':'": "",
- "store as textfile;": ""
- },
- "sysProps": {
- "nameTemplate": "{defKey}[{defName}]"
- },
- "notes": {},
- "headers": [
- {
- "refKey": "hideInGraph",
- "hideInGraph": true
- },
- {
- "refKey": "defKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "defName",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "primaryKey",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "notNull",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "autoIncrement",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "domain",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "type",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "len",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "scale",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "comment",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "refDict",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "defaultValue",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "isStandard",
- "freeze": false,
- "hideInGraph": false
- },
- {
- "refKey": "uiHint",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "extProps",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr1",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr2",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr3",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr4",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr5",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr6",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr7",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr8",
- "freeze": false,
- "hideInGraph": true
- },
- {
- "refKey": "attr9",
- "freeze": false,
- "hideInGraph": true
- }
- ],
- "fields": [
- {
- "defKey": "id",
- "defName": "涓婚敭",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": true,
- "notNull": true,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "id": "F7E0BFAE-F178-43E0-8482-2DCE7CEFB184"
- },
- {
- "defKey": "create_by",
- "defName": "鍒涘缓浜�",
- "comment": "",
- "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "F445F433-E877-4D2A-8ECE-03043F0ACB7D",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "create_time",
- "defName": "鍒涘缓鏃堕棿",
- "comment": "",
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "E690295E-8BFF-49DA-8966-6A3FE3824883",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "update_by",
- "defName": "鏇存柊浜�",
- "comment": "",
- "domain": "54611CCC-CA4B-42E1-9F32-4944C85B85A6",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "E3C7E33A-8B8C-4F70-BA59-3B5A10C50734",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "update_time",
- "defName": "鏇存柊鏃堕棿",
- "comment": "",
- "domain": "7CFFA0D3-6A93-4DDC-BC10-DF21211064DC",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "uiHint": "",
- "id": "93258189-F627-4142-BC39-0295E3A52033",
- "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
- },
- {
- "defKey": "del_flag",
- "defName": "鍒犻櫎鏍囪",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811",
- "extProps": {},
- "domain": "6BC8F04B-6CFA-4995-98D3-318F5CDD774E",
- "id": "F80D66E7-8670-4B1C-9940-041DBAD0580A"
- },
- {
- "defKey": "request_id",
- "defName": "鐢宠鍗旾D",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
- "extProps": {},
- "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
- "id": "850A2C7A-D321-4283-B735-7BCC56DF7933"
- },
- {
- "defKey": "material_number",
- "defName": "鐗╂枡缂栫爜",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "domain": "BE09D493-E183-402D-ACC4-EEA21EB35B8E",
- "refDict": "",
- "extProps": {},
- "notes": {},
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "E77D6EFA-7408-4891-888B-D6FC2CF8E6E5",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "material_name",
- "defName": "鐗╂枡鍚嶇О",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
- "refDict": "",
- "extProps": {},
- "notes": {},
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "270E5417-96C7-4540-AC29-07C8FCC3CD38",
- "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
- },
- {
- "defKey": "specified_quantity",
- "defName": "鐞嗚鎷夊姩鏁伴噺",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
- "extProps": {},
- "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
- "id": "D7028092-5311-4FC1-B6F2-19B1FFBFA85B"
- },
- {
- "defKey": "actual_quantity",
- "defName": "瀹為檯鎷夊姩鏁伴噺",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
- "extProps": {},
- "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
- "id": "4E9708B3-14B0-45A0-A3B8-351D759C7B47"
- },
- {
- "defKey": "remaining_quantity",
- "defName": "杞﹂棿鍓╀綑鏁伴噺",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "baseType": "1A0BDC09-0792-4174-9E8E-80BE8DF44B8E",
- "extProps": {},
- "domain": "FF4459C5-6B45-4DBF-8FC0-E06239BC05B4",
- "id": "FE041E9A-5D05-42EE-AA33-C563B66B99A5"
}
],
"correlations": [],
@@ -70036,7 +69803,6 @@
"70FEB6D0-FC18-42C5-8608-34E8BBB4A406",
"D16FD5E0-8B16-4C0E-AD67-6E5C2FED1A65",
"5835D3E9-4B10-48DC-B116-584E447AA201",
- "2FF92658-07FE-49BC-A690-E24FA5226BB3",
"23C6B8F0-0010-4453-B3C2-9305746C37AB",
"D3263A0C-1D6A-453A-B933-86651B5566FE"
],
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
deleted file mode 100644
index 28533aa..0000000
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferDetailController.java
+++ /dev/null
@@ -1,176 +0,0 @@
-package org.jeecg.modules.mes.controller;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
-import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
-import org.jeecg.modules.mes.entity.MesMaterialUnloading;
-import org.jeecg.modules.mes.service.IMesMaterialTransferDetailService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.Arrays;
-
-/**
-* @Description: 鐗╂枡鎷夊姩鏄庣粏
-* @Author: jeecg-boot
-* @Date: 2025-07-07
-* @Version: V1.0
-*/
-@Api(tags="鐗╂枡鎷夊姩鏄庣粏")
-@RestController
-@RequestMapping("/mes/mesMaterialTransferDetail")
-@Slf4j
-public class MesMaterialTransferDetailController extends JeecgController<MesMaterialTransferDetail, IMesMaterialTransferDetailService> {
- @Autowired
- private IMesMaterialTransferDetailService mesMaterialTransferDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param mesMaterialTransferDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ", notes="鐗╂枡鎷夊姩鏄庣粏-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<MesMaterialTransferDetail>> queryPageList(MesMaterialTransferDetail mesMaterialTransferDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<MesMaterialTransferDetail> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferDetail, req.getParameterMap());
- Page<MesMaterialTransferDetail> page = new Page<MesMaterialTransferDetail>(pageNo, pageSize);
- IPage<MesMaterialTransferDetail> pageList = mesMaterialTransferDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param mesMaterialTransferDetail
- * @return
- */
- @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-娣诲姞")
- @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-娣诲姞", notes="鐗╂枡鎷夊姩鏄庣粏-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody MesMaterialTransferDetail mesMaterialTransferDetail) {
- mesMaterialTransferDetailService.save(mesMaterialTransferDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param mesMaterialTransferDetail
- * @return
- */
- @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-缂栬緫")
- @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-缂栬緫", notes="鐗╂枡鎷夊姩鏄庣粏-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody MesMaterialTransferDetail mesMaterialTransferDetail) {
- mesMaterialTransferDetailService.updateById(mesMaterialTransferDetail);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎", notes="鐗╂枡鎷夊姩鏄庣粏-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- mesMaterialTransferDetailService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎")
- @ApiOperation(value="鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎", notes="鐗╂枡鎷夊姩鏄庣粏-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.mesMaterialTransferDetailService.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<MesMaterialTransferDetail> queryById(@RequestParam(name="id",required=true) String id) {
- MesMaterialTransferDetail mesMaterialTransferDetail = mesMaterialTransferDetailService.getById(id);
- if(mesMaterialTransferDetail==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(mesMaterialTransferDetail);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param mesMaterialTransferDetail
- */
- //@RequiresPermissions("org.jeecg.modules:mes_material_transfer_detail:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MesMaterialTransferDetail mesMaterialTransferDetail) {
- return super.exportXls(request, mesMaterialTransferDetail, MesMaterialTransferDetail.class, "鐗╂枡鎷夊姩鏄庣粏");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mes_material_transfer_detail:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, MesMaterialTransferDetail.class);
- }
- /*
- * 鏍规嵁requestId鏌ヨ鏄庣粏
- * @param requestId
- * */
- @RequestMapping("/queryTransferDetailBy")
- public Result<IPage<MesMaterialTransferDetail>> queryUnloadingByLoadingId(MesMaterialTransferDetail mesMaterialTransferDetail, @RequestParam("requestId") String loadingId,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<MesMaterialTransferDetail> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialTransferDetail, req.getParameterMap());
- queryWrapper.eq("request_id", loadingId);
- Page<MesMaterialTransferDetail> page = new Page<MesMaterialTransferDetail>(pageNo, pageSize);
- IPage<MesMaterialTransferDetail> pageList = mesMaterialTransferDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
index e7dc83f..a2fe846 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesMaterialTransferRequestController.java
@@ -28,7 +28,7 @@
*/
@Api(tags="鐗╂枡鎷夊姩鐢宠")
@RestController
-@RequestMapping("/mesmaterialtransferrequest/mesMaterialTransferRequest")
+@RequestMapping("/mes/mesMaterialTransferRequest")
@Slf4j
public class MesMaterialTransferRequestController extends JeecgController<MesMaterialTransferRequest, IMesMaterialTransferRequestService> {
@Autowired
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java
deleted file mode 100644
index f913256..0000000
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferDetail.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.jeecg.modules.mes.entity;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * @Description: 鐗╂枡鎷夊姩鏄庣粏
- * @Author: jeecg-boot
- * @Date: 2025-07-07
- * @Version: V1.0
- */
-@Data
-@TableName("mes_material_transfer_detail")
-@Accessors(chain = true)
-@EqualsAndHashCode(callSuper = false)
-@ApiModel(value="mes_material_transfer_detail瀵硅薄", description="鐗╂枡鎷夊姩鏄庣粏")
-public class MesMaterialTransferDetail implements Serializable {
- private static final long serialVersionUID = 1L;
-
- /**涓婚敭*/
- @TableId(type = IdType.ASSIGN_ID)
- @ApiModelProperty(value = "涓婚敭")
- private String id;
- /**鍒涘缓浜�*/
- @ApiModelProperty(value = "鍒涘缓浜�")
- private String createBy;
- /**鍒涘缓鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鍒涘缓鏃ユ湡")
- private Date createTime;
- /**鏇存柊浜�*/
- @ApiModelProperty(value = "鏇存柊浜�")
- private String updateBy;
- /**鏇存柊鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鏇存柊鏃ユ湡")
- private Date updateTime;
- /**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
- @ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
- private Integer delFlag;
- /**鐢宠鍗旾D*/
- @Excel(name = "鐢宠鍗旾D", width = 15)
- @ApiModelProperty(value = "鐢宠鍗旾D")
- private String requestId;
- /**鐗╂枡缂栫爜*/
- @Excel(name = "鐗╂枡缂栫爜", width = 15)
- @ApiModelProperty(value = "鐗╂枡缂栫爜")
- private String materialNumber;
- /**鐗╂枡鍚嶇О*/
- @Excel(name = "鐗╂枡鍚嶇О", width = 15)
- @ApiModelProperty(value = "鐗╂枡鍚嶇О")
- private String materialName;
- /**鐞嗚鎷夊姩鏁伴噺*/
- @Excel(name = "鐞嗚鎷夊姩鏁伴噺", width = 15)
- @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
- private Double specifiedQuantity;
- /**瀹為檯鎷夊姩鏁伴噺*/
- @Excel(name = "瀹為檯鎷夊姩鏁伴噺", width = 15)
- @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
- private Double actualQuantity;
- /**杞﹂棿鍓╀綑鏁伴噺*/
- @Excel(name = "杞﹂棿鍓╀綑鏁伴噺", width = 15)
- @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
- private Double remainingQuantity;
-}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
index 09e3660..af2443c 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesMaterialTransferRequest.java
@@ -49,57 +49,61 @@
@ApiModelProperty(value = "鏇存柊鏃ユ湡")
private Date updateTime;
/**鍒犻櫎鏍囪*/
- @Excel(name = "鍒犻櫎鏍囪", width = 15)
@ApiModelProperty(value = "鍒犻櫎鏍囪")
@TableLogic
private Integer delFlag;
/**鎷夊姩鍗曞彿*/
- @Excel(name = "鎷夊姩鍗曞彿", width = 15)
@ApiModelProperty(value = "鎷夊姩鍗曞彿")
private String requestCode;
/**宸ュ崟ID*/
- @Excel(name = "宸ュ崟ID", width = 15)
@ApiModelProperty(value = "宸ュ崟ID")
private String workOrderId;
/**SAP棰勭暀鍙�*/
- @Excel(name = "SAP棰勭暀鍙�", width = 15)
@ApiModelProperty(value = "SAP棰勭暀鍙�")
private String reservationCode;
/**鍙戝竷鐘舵��*/
- @Excel(name = "鍙戝竷鐘舵��", width = 15, dicCode = "publish_status")
@Dict(dicCode = "publish_status")
@ApiModelProperty(value = "鍙戝竷鐘舵��")
private String publishStatus;
/**璇锋眰鐘舵��*/
- @Excel(name = "璇锋眰鐘舵��", width = 15, dicCode = "request_status")
@Dict(dicCode = "request_status")
@ApiModelProperty(value = "璇锋眰鐘舵��")
private String requestStatus;
/**璇锋眰鏃堕棿*/
- @Excel(name = "璇锋眰鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "璇锋眰鏃堕棿")
private Date requestTime;
/**鍘熷簱瀛樺湴*/
- @Excel(name = "鍘熷簱瀛樺湴", width = 15)
@ApiModelProperty(value = "鍘熷簱瀛樺湴")
private String originalWarehouseId;
/**鐩爣搴撳瓨鍦�*/
- @Excel(name = "鐩爣搴撳瓨鍦�", width = 15)
@ApiModelProperty(value = "鐩爣搴撳瓨鍦�")
private String targetWarehouseId;
/**浼樺厛绾э紙鎷夊姩绫诲瀷锛�*/
- @Excel(name = "浼樺厛绾э紙鎷夊姩绫诲瀷锛�", width = 15, dicCode = "priority")
- @Dict(dicCode = "priority")
- @ApiModelProperty(value = "浼樺厛绾э紙鎷夊姩绫诲瀷锛�")
- private String priority;
+ @Dict(dicCode = "material_transfer_category")
+ @ApiModelProperty(value = "鎷夊姩绫诲瀷")
+ private String materialTransferCategory;
/**鏈�鏅氶厤閫佹椂闂�*/
- @Excel(name = "鏈�鏅氶厤閫佹椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鏈�鏅氶厤閫佹椂闂�")
private Date latestDeliveryTime;
+ /**鐗╂枡缂栫爜*/
+ @ApiModelProperty(value = "鐗╂枡缂栫爜")
+ private String materialNumber;
+ /**鐗╂枡鍚嶇О*/
+ @ApiModelProperty(value = "鐗╂枡鍚嶇О")
+ private String materialName;
+ /**鐞嗚鎷夊姩鏁伴噺*/
+ @ApiModelProperty(value = "鐞嗚鎷夊姩鏁伴噺")
+ private Double specifiedQuantity;
+ /**瀹為檯鎷夊姩鏁伴噺*/
+ @ApiModelProperty(value = "瀹為檯鎷夊姩鏁伴噺")
+ private Double actualQuantity;
+ /**杞﹂棿鍓╀綑鏁伴噺*/
+ @ApiModelProperty(value = "杞﹂棿鍓╀綑鏁伴噺")
+ private Double remainingQuantity;
@TableField(exist = false)
@ApiModelProperty(value = "宸ュ崟鍙�")
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java b/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java
deleted file mode 100644
index b8e507a..0000000
--- a/src/main/java/org/jeecg/modules/mes/mapper/MesMaterialTransferDetailMapper.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.mes.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
-
-/**
- * @Description: 鐗╂枡鎷夊姩鏄庣粏
- * @Author: jeecg-boot
- * @Date: 2025-07-07
- * @Version: V1.0
- */
-public interface MesMaterialTransferDetailMapper extends BaseMapper<MesMaterialTransferDetail> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml b/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml
deleted file mode 100644
index e4afcfa..0000000
--- a/src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialTransferDetailMapper.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.jeecg.modules.mes.mapper.MesMaterialTransferDetailMapper">
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java b/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java
deleted file mode 100644
index 6208670..0000000
--- a/src/main/java/org/jeecg/modules/mes/service/IMesMaterialTransferDetailService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.jeecg.modules.mes.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
-
-/**
- * @Description: 鐗╂枡鎷夊姩鏄庣粏
- * @Author: jeecg-boot
- * @Date: 2025-07-07
- * @Version: V1.0
- */
-public interface IMesMaterialTransferDetailService extends IService<MesMaterialTransferDetail> {
-
-}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java
deleted file mode 100644
index a4bf035..0000000
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialTransferDetailServiceImpl.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package org.jeecg.modules.mes.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.jeecg.modules.mes.entity.MesMaterialTransferDetail;
-import org.jeecg.modules.mes.mapper.MesMaterialTransferDetailMapper;
-import org.jeecg.modules.mes.service.IMesMaterialTransferDetailService;
-import org.springframework.stereotype.Service;
-
-/**
- * @Description: 鐗╂枡鎷夊姩鏄庣粏
- * @Author: jeecg-boot
- * @Date: 2025-07-07
- * @Version: V1.0
- */
-@Service
-public class MesMaterialTransferDetailServiceImpl extends ServiceImpl<MesMaterialTransferDetailMapper, MesMaterialTransferDetail> implements IMesMaterialTransferDetailService {
-
-}
--
Gitblit v1.9.3