From 5e6c3ac5d7c7a2702a0bad5195e954c9e95d2306 Mon Sep 17 00:00:00 2001
From: Houjie <714924425@qq.com>
Date: 星期日, 15 六月 2025 17:55:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
index bbe1a7f..b4b0f7c 100644
--- a/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
+++ b/lxzn-module-tms/src/main/java/org/jeecg/modules/tms/controller/PreparationOrderController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.tms.controller;
+import com.alibaba.fastjson.JSONObject;
import org.jeecg.common.system.query.QueryGenerator;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -72,9 +73,10 @@
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<PreparationOrder> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrder, parameterMap);
Page<PreparationOrder> page = new Page<PreparationOrder>(pageNo, pageSize);
- IPage<PreparationOrder> pageList = preparationOrderService.page(page, queryWrapper);
+ IPage<PreparationOrder> pageList = preparationOrderService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
@@ -89,6 +91,15 @@
@PostMapping(value = "/add")
public Result<String> add(@RequestBody PreparationOrder preparationOrder) {
preparationOrderService.save(preparationOrder);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�")
+ @ApiOperation(value="鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�", notes="鍒�鍏峰噯澶囧崟-浠嶥NC绯荤粺鍐欏叆鍒�鍏峰噯澶囧崟鍙婃槑缁�")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:add")
+ @PostMapping(value = "/addPreparationOrderFromDnc")
+ public Result<String> addPreparationOrderFromDnc(@RequestBody PreparationOrderAndDetailDto preparationOrderAndDetailDto) {
+ preparationOrderService.addPreparationOrderFromDnc(preparationOrderAndDetailDto);
return Result.OK("娣诲姞鎴愬姛锛�");
}
@@ -139,8 +150,17 @@
//@RequiresPermissions("org.jeecg.modules:tms_preparation_order:deleteBatch")
@DeleteMapping(value = "/deleteBatch")
public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
+ preparationOrderService.delBatchMain(Arrays.asList(ids.split(",")));
return Result.OK("鎵归噺鍒犻櫎鎴愬姛!");
+ }
+
+ @AutoLog(value = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟")
+ @ApiOperation(value = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟", notes = "鍒�鍏峰噯澶囧崟-杞嚭搴撶敵璇峰崟")
+ //@RequiresPermissions("org.jeecg.modules:tms_preparation_order:convert")
+ @PostMapping(value = "/convertToOutboundOrder")
+ public Result<String> convertToOutboundOrder(@RequestBody List<String> preparationOrderIds) {
+ List<String> result = preparationOrderService.convertToOutboundOrder(preparationOrderIds);
+ return Result.OK(JSONObject.toJSONString(result));
}
/**
@@ -177,9 +197,10 @@
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
- QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, req.getParameterMap());
+ Map<String, String[]> parameterMap = req.getParameterMap();
+ QueryWrapper<PreparationOrderDetail> queryWrapper = QueryGenerator.initQueryWrapper(preparationOrderDetail, parameterMap);
Page<PreparationOrderDetail> page = new Page<PreparationOrderDetail>(pageNo, pageSize);
- IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.page(page, queryWrapper);
+ IPage<PreparationOrderDetail> pageList = preparationOrderDetailService.queryPageList(page, parameterMap);
return Result.OK(pageList);
}
--
Gitblit v1.9.3