From d1d5454cb3512acb16a0f0e6d68e52f3ebc72e66 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 04 八月 2025 16:52:26 +0800
Subject: [PATCH] art: 生产订单列表、编辑功能修改
---
db/双林新火炬MES数据库设计.pdma.json | 22 +++++
src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java | 27 +++---
src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java | 191 ++++++++++++++---------------------------------
3 files changed, 89 insertions(+), 151 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 79a4257..d07012a 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-1 16:49:40",
+ "updatedTime": "2025-8-4 15:03:28",
"dbConns": [],
"profile": {
"default": {
@@ -10697,7 +10697,7 @@
},
{
"defKey": "production_unit",
- "defName": "浜у搧鍗曚綅",
+ "defName": "鍩烘湰璁￠噺鍗曚綅",
"comment": "",
"type": "",
"len": "",
@@ -10732,6 +10732,24 @@
"id": "EA8BA140-CED8-4B45-8FCC-197817AA3590"
},
{
+ "defKey": "order_status_name",
+ "defName": "璁㈠崟鐘舵�佹弿杩�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
+ "extProps": {},
+ "domain": "9092C4E0-1A54-4859-ABBB-5B62DBC27573",
+ "id": "F5A7DE2A-A683-4218-A1B5-9CDA18C273B7"
+ },
+ {
"defKey": "priority",
"defName": "浼樺厛绾�",
"comment": "",
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
index 63d55ef..7003c7f 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesProductionOrderController.java
@@ -14,148 +14,71 @@
import org.jeecg.modules.mes.service.IMesProductionOrderService;
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: SAP鐢熶骇璁㈠崟
-* @Author: jeecg-boot
-* @Date: 2025-07-04
-* @Version: V1.0
-*/
-@Api(tags="SAP鐢熶骇璁㈠崟")
+ * @Description: SAP鐢熶骇璁㈠崟
+ * @Author: jeecg-boot
+ * @Date: 2025-07-04
+ * @Version: V1.0
+ */
+@Api(tags = "SAP鐢熶骇璁㈠崟")
@RestController
-@RequestMapping("/mesproductionwork/mesProductionOrder")
+@RequestMapping("/mes/productionOrder")
@Slf4j
public class MesProductionOrderController extends JeecgController<MesProductionOrder, IMesProductionOrderService> {
- @Autowired
- private IMesProductionOrderService mesProductionOrderService;
+ @Autowired
+ private IMesProductionOrderService mesProductionOrderService;
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param mesProductionOrder
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ", notes="SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<MesProductionOrder>> queryPageList(MesProductionOrder mesProductionOrder,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<MesProductionOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionOrder, req.getParameterMap());
- Page<MesProductionOrder> page = new Page<MesProductionOrder>(pageNo, pageSize);
- IPage<MesProductionOrder> pageList = mesProductionOrderService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param mesProductionOrder
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "SAP鐢熶骇璁㈠崟-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<MesProductionOrder>> queryPageList(MesProductionOrder mesProductionOrder,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<MesProductionOrder> queryWrapper = QueryGenerator.initQueryWrapper(mesProductionOrder, req.getParameterMap());
+ Page<MesProductionOrder> page = new Page<MesProductionOrder>(pageNo, pageSize);
+ IPage<MesProductionOrder> pageList = mesProductionOrderService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
- /**
- * 娣诲姞
- *
- * @param mesProductionOrder
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-娣诲姞")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-娣诲姞", notes="SAP鐢熶骇璁㈠崟-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody MesProductionOrder mesProductionOrder) {
- mesProductionOrderService.save(mesProductionOrder);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
+ /**
+ * 缂栬緫
+ *
+ * @param mesProductionOrder
+ * @return
+ */
+ @AutoLog(value = "SAP鐢熶骇璁㈠崟-缂栬緫")
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-缂栬緫", notes = "SAP鐢熶骇璁㈠崟-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody MesProductionOrder mesProductionOrder) {
+ mesProductionOrderService.updateById(mesProductionOrder);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
- /**
- * 缂栬緫
- *
- * @param mesProductionOrder
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-缂栬緫")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-缂栬緫", notes="SAP鐢熶骇璁㈠崟-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody MesProductionOrder mesProductionOrder) {
- mesProductionOrderService.updateById(mesProductionOrder);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎", notes="SAP鐢熶骇璁㈠崟-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- mesProductionOrderService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎", notes="SAP鐢熶骇璁㈠崟-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.mesProductionOrderService.removeByIds(Arrays.asList(ids.split(",")));
- return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鏌ヨ
- *
- * @param id
- * @return
- */
- //@AutoLog(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
- @ApiOperation(value="SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ", notes="SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
- @GetMapping(value = "/queryById")
- public Result<MesProductionOrder> queryById(@RequestParam(name="id",required=true) String id) {
- MesProductionOrder mesProductionOrder = mesProductionOrderService.getById(id);
- if(mesProductionOrder==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(mesProductionOrder);
- }
-
- /**
- * 瀵煎嚭excel
- *
- * @param request
- * @param mesProductionOrder
- */
- //@RequiresPermissions("org.jeecg.modules:mes_production_order:exportXls")
- @RequestMapping(value = "/exportXls")
- public ModelAndView exportXls(HttpServletRequest request, MesProductionOrder mesProductionOrder) {
- return super.exportXls(request, mesProductionOrder, MesProductionOrder.class, "SAP鐢熶骇璁㈠崟");
- }
-
- /**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
- //@RequiresPermissions("mes_production_order:importExcel")
- @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
- public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, MesProductionOrder.class);
- }
-
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ", notes = "SAP鐢熶骇璁㈠崟-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<MesProductionOrder> queryById(@RequestParam(name = "id", required = true) String id) {
+ MesProductionOrder mesProductionOrder = mesProductionOrderService.getById(id);
+ if (mesProductionOrder == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(mesProductionOrder);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
index e6e7f4d..2d2f5fa 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionOrder.java
@@ -2,7 +2,6 @@
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;
@@ -42,27 +41,23 @@
@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;
/**鍒犻櫎鏍囪*/
@ApiModelProperty(value = "鍒犻櫎鏍囪")
- @TableLogic
private Integer delFlag;
/**鐢熶骇璁㈠崟鍙�*/
@ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
private String orderCode;
/**璁㈠崟绫诲瀷*/
@ApiModelProperty(value = "璁㈠崟绫诲瀷")
+ @Dict(dicCode = "production_order_category")
private String orderCategory;
/**鐗╂枡缂栧彿*/
@ApiModelProperty(value = "鐗╂枡缂栧彿")
@@ -71,28 +66,28 @@
@ApiModelProperty(value = "鐗╂枡鍚嶇О")
private String materialName;
/**璁″垝寮�濮嬫棩鏈�*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "璁″垝寮�濮嬫棩鏈�")
private Date planStart;
/**璁″垝缁撴潫鏃ユ湡*/
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "璁″垝缁撴潫鏃ユ湡")
private Date planEnd;
/**璁㈠崟鏁伴噺*/
@ApiModelProperty(value = "璁㈠崟鏁伴噺")
private BigDecimal orderQuantity;
- /**浜у搧鍗曚綅*/
- @Dict(dicCode = "production_unit")
- @ApiModelProperty(value = "浜у搧鍗曚綅")
+ /**鍩烘湰璁￠噺鍗曚綅*/
+ @ApiModelProperty(value = "鍩烘湰璁￠噺鍗曚綅")
private String productionUnit;
/**璁㈠崟鐘舵��*/
- @Dict(dicCode = "order_status")
@ApiModelProperty(value = "璁㈠崟鐘舵��")
private String orderStatus;
+ /**璁㈠崟鐘舵�佹弿杩�*/
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�")
+ private String orderStatusName;
/**浼樺厛绾�*/
- @Dict(dicCode = "priority")
@ApiModelProperty(value = "浼樺厛绾�")
private String priority;
/**璁″垝宸ヨ壓璺嚎*/
@@ -148,6 +143,7 @@
this.orderQuantity = new BigDecimal(dto.getGAMNG());
this.productionUnit = dto.getGMEIN();
this.orderStatus = dto.getTXT04();
+ this.orderStatusName = dto.getTXT30();
this.priority = dto.getAPRIO();
this.processRoute = dto.getAUFPL();
this.materialListCode = dto.getSTLNR();
@@ -168,6 +164,7 @@
this.planEnd = DateUtils.str2Date(dto.getGLTRP(), DateUtils.date_sdf.get());
this.orderQuantity = new BigDecimal(dto.getGAMNG());
this.orderStatus = dto.getTXT04();
+ this.orderStatusName = dto.getTXT30();
this.priority = dto.getAPRIO();
this.orderCreateDate = dto.getUDATE();
this.orderUpdateDate = dto.getLAEDA();
--
Gitblit v1.9.3