From 256884f9364d1312f09410b20736c0c70aa53bef Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 25 八月 2025 15:58:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/mapper/CuttingInventoryMapper.java | 8
src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java | 20 ++
src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java | 2
src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java | 1
src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java | 157 ++++++++++++---
src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java | 6
src/main/java/org/jeecg/modules/cms/service/ICuttingInventoryService.java | 7
src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java | 258 +++++++++++++------------
src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java | 16 +
src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java | 1
src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java | 80 ++++++++
src/main/java/org/jeecg/modules/andon/controller/AndonOrderController.java | 2
src/main/java/org/jeecg/modules/andon/service/impl/AndonOrderServiceImpl.java | 2
src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml | 12 +
14 files changed, 399 insertions(+), 173 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/andon/controller/AndonOrderController.java b/src/main/java/org/jeecg/modules/andon/controller/AndonOrderController.java
index 2b8e922..d05ceca 100644
--- a/src/main/java/org/jeecg/modules/andon/controller/AndonOrderController.java
+++ b/src/main/java/org/jeecg/modules/andon/controller/AndonOrderController.java
@@ -83,6 +83,8 @@
String productionLineId = andonResponseConfigService.getProductionLineIdByButtonId(andonOrder.getButtonId());
if (productionLineId != null) {
andonOrder.setFactoryId(productionLineId);
+ }else{
+ return Result.error("鏈壘鍒板搴旂殑浜х嚎ID,璇峰厛杩涜瀹夌伅鍝嶅簲閰嶇疆锛�");
}
}
andonOrderService.save(andonOrder);
diff --git a/src/main/java/org/jeecg/modules/andon/service/impl/AndonOrderServiceImpl.java b/src/main/java/org/jeecg/modules/andon/service/impl/AndonOrderServiceImpl.java
index e9b6a34..205d5e7 100644
--- a/src/main/java/org/jeecg/modules/andon/service/impl/AndonOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/andon/service/impl/AndonOrderServiceImpl.java
@@ -68,7 +68,7 @@
// 璁剧疆宸ュ崟鐘舵�佷负澶勭悊涓�
andonOrder.setOrderStatus("3");
- // 鑾峰彇鍝嶅簲鑰呯敤鎴峰悕
+ // 鑾峰彇鍝嶅簲鐢ㄦ埛鍚�
String responderUsername = andonOrder.getResponder();
// 楠岃瘉鍝嶅簲鑰呯敤鎴峰悕涓嶄负绌�
diff --git a/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java b/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
index 5129363..f121ee5 100644
--- a/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/andon/service/impl/AndonResponseConfigServiceImpl.java
@@ -55,7 +55,7 @@
@Override
public String getProductionLineIdByButtonId(String buttonId) {
QueryWrapper<AndonResponseConfig> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("button_id", buttonId);
+ queryWrapper.eq("button_id", buttonId); // 纭繚杩欓噷浣跨敤鐨勬槸鏁版嵁搴撳瓧娈靛悕
AndonResponseConfig config = this.getOne(queryWrapper);
return config != null ? config.getFactoryId() : null;
}
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
index 5b702de..173d574 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
@@ -1,5 +1,6 @@
package org.jeecg.modules.cms.controller;
+import java.math.BigDecimal;
import java.util.*;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,8 +11,11 @@
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.cms.entity.CuttingInbound;
import org.jeecg.modules.cms.entity.CuttingInboundDetail;
+import org.jeecg.modules.cms.entity.CuttingInboundInventory;
+import org.jeecg.modules.cms.entity.CuttingInventory;
import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
+import org.jeecg.modules.cms.service.ICuttingInboundInventoryService;
import org.jeecg.modules.cms.service.ICuttingInboundService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -19,13 +23,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
+import org.jeecg.modules.cms.service.ICuttingInventoryService;
import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
+import org.jeecgframework.poi.excel.ExcelImportUtil;
import org.jeecgframework.poi.excel.def.NormalExcelConstants;
import org.jeecgframework.poi.excel.entity.ExportParams;
+import org.jeecgframework.poi.excel.entity.ImportParams;
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -51,6 +60,10 @@
@Autowired
private CuttingInboundMapper cuttingInboundMapper;
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
+ @Autowired
+ private ICuttingInboundInventoryService cuttingInboundInventoryService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -224,42 +237,30 @@
//@RequiresPermissions("cms_cutting_inbound:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
- return super.importExcel(request, response, CuttingInbound.class);
-// MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
-// Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
-//
-// for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
-// MultipartFile file = entity.getValue();
-// ImportParams params = new ImportParams();
-// params.setTitleRows(1);
-// params.setHeadRows(1);
-// try {
-// // 瑙ｆ瀽Excel鏂囦欢
-// List<CuttingInbound> list = ExcelImportUtil.importExcel(file.getInputStream(), CuttingInbound.class, params);
-//
-// for (CuttingInbound cuttingInbound : list) {
-// // 淇濆瓨涓昏〃鏁版嵁
-// cuttingInboundService.save(cuttingInbound);
-//
-// // 鑾峰彇涓昏〃ID
-// String orderId = cuttingInbound.getId();
-//
-// // 澶勭悊浠庤〃鏁版嵁
-// List<CuttingInboundDetail> detailList = cuttingInbound.getDetailList(); // 鍋囪涓昏〃瀹炰綋涓湁浠庤〃鏁版嵁鍒楄〃
-// if (detailList != null && !detailList.isEmpty()) {
-// for (CuttingInboundDetail detail : detailList) {
-// detail.setOrderId(orderId); // 璁剧疆澶栭敭鍏宠仈
-// cuttingInboundDetailService.save(detail);
-// }
-// }
-// }
-// return Result.ok("瀵煎叆鎴愬姛");
-// } catch (Exception e) {
-// log.error("瀵煎叆澶辫触", e);
-// return Result.error("瀵煎叆澶辫触");
-// }
-// }
-// return Result.error("瀵煎叆澶辫触");
+// return super.importExcel(request, response, CuttingInbound.class);
+ MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;
+ Map<String, MultipartFile> fileMap = multipartRequest.getFileMap();
+
+ for (Map.Entry<String, MultipartFile> entity : fileMap.entrySet()) {
+ MultipartFile file = entity.getValue();
+ ImportParams params = new ImportParams();
+ params.setTitleRows(1);
+ params.setHeadRows(1);
+ try {
+ // 瑙ｆ瀽Excel鏂囦欢
+ List<CuttingInboundExportVo> list = ExcelImportUtil.importExcel(file.getInputStream(), CuttingInboundExportVo.class, params);
+
+ // 璋冪敤Service灞傚鐞嗗鍏ラ�昏緫
+ return cuttingInboundService.importExcelData(list);
+ } catch (org.jeecgframework.poi.exception.excel.ExcelImportException e) {
+ log.error("Excel瀵煎叆寮傚父", e);
+ return Result.error("Excel鏁版嵁鏍煎紡閿欒锛岃妫�鏌ユ暟鎹槸鍚︾鍚堟ā鏉胯姹�");
+ } catch (Exception e) {
+ log.error("瀵煎叆澶辫触", e);
+ return Result.error("瀵煎叆澶辫触: " + e.getMessage());
+ }
+ }
+ return Result.error("瀵煎叆澶辫触");
}
@@ -275,4 +276,88 @@
return Result.ok(list);
}
+
+ /*
+ * 鐢熸垚鍞竴鏉＄爜鐨勬柟娉�
+ */
+ private String generateUniqueBarcode(String cuttingId, int index) {
+ // 鏉＄爜鐢熸垚瑙勫垯绀轰緥锛氬垁鍏稩D + 搴忓彿(4浣�) + 闅忔満鏁�
+ return cuttingId + String.format("%04d", index + 1) + (int) (Math.random() * 10000);
+ }
+ @GetMapping("/submit")
+ public Result<?> submit(@RequestParam("orderId") String orderId) {
+ // cuttingInboundService.submit(orderId);
+ // return Result.ok("鎻愪氦鎴愬姛");
+ try {
+ // 1. 鏇存柊鍏ュ簱鍗曠姸鎬�
+ CuttingInbound cuttingInbound = cuttingInboundService.getById(orderId);
+ if (cuttingInbound == null) {
+ return Result.error("鏈壘鍒板搴旂殑鍏ュ簱鍗�");
+ }
+
+ // 妫�鏌ュ叆搴撳崟鐘舵�侊紝鍙厑璁哥姸鎬佷负"1"鐨勫叆搴撳崟鎻愪氦
+ if (!"1".equals(cuttingInbound.getOrderStatus())) {
+ return Result.error("鍙湁鐘舵�佷负鏈彁浜ょ殑鍏ュ簱鍗曟墠鑳芥墽琛屾彁浜ゆ搷浣�");
+ }
+
+ // 2. 鏇存柊鐘舵�佷负宸叉彁浜�
+ cuttingInbound.setOrderStatus("2");
+ boolean updateResult = cuttingInboundService.updateById(cuttingInbound);
+ if (!updateResult) {
+ return Result.error("鏇存柊鍏ュ簱鍗曠姸鎬佸け璐�");
+ }
+
+ // 3. 鑾峰彇鍏ュ簱鏄庣粏
+ List<CuttingInboundDetail> detailList = cuttingInboundDetailService.lambdaQuery()
+ .eq(CuttingInboundDetail::getOrderId, orderId)
+ .list();
+
+ // 鐢ㄤ簬缁熻鎬绘暟閲�
+
+ // 4. 鏍规嵁鏄庣粏鏁伴噺鐢熸垚搴撳瓨璁板綍鍜屾潯鐮�
+ int totalSubmitted = 0;
+ for (CuttingInboundDetail detail : detailList) {
+ // 鏍规嵁鏄庣粏涓殑鏁伴噺鐢熸垚瀵瑰簲鏁伴噺鐨勫簱瀛樿褰時eceive_number
+ int quantity = detail.getReceiveNumber() != null ? detail.getReceiveNumber() : 0;
+ totalSubmitted = 0;
+ for (int i = 0; i < quantity; i++) {
+ totalSubmitted += quantity;
+ // 涓烘瘡涓垁鍏风敓鎴愮嫭绔嬬殑搴撳瓨璁板綍
+ CuttingInventory cuttingInventory = new CuttingInventory();
+ cuttingInventory.setCuttingId(detail.getCuttingId());
+ // 涓烘瘡涓垁鍏风敓鎴愬敮涓�鏉＄爜
+ cuttingInventory.setCuttingBarcode(generateUniqueBarcode(detail.getCuttingId(), i));
+ // 璁剧疆搴撳瓨鐘舵�佷负鍦ㄥ簱
+ cuttingInventory.setInventoryStatus("姝ｅ父");
+ // 璁剧疆褰撳墠瀵垮懡涓�100
+ cuttingInventory.setCurrentLife(BigDecimal.valueOf(100));
+ // 淇濆瓨鍒板簱瀛樿〃
+ boolean saveResult = cuttingInventoryService.save(cuttingInventory);
+ if (!saveResult) {
+ return Result.error("淇濆瓨搴撳瓨璁板綍澶辫触");
+ }
+
+ // 寤虹珛鍏ュ簱鍗曚笌搴撳瓨鐨勫叧鑱斿叧绯�
+ CuttingInboundInventory cuttingInboundInventory = new CuttingInboundInventory();
+ cuttingInboundInventory.setOrderId(orderId);
+ cuttingInboundInventory.setInventoryId(cuttingInventory.getId());
+
+ // 淇濆瓨鍏宠仈鍏崇郴
+ boolean relationSaveResult = cuttingInboundInventoryService.save(cuttingInboundInventory);
+ if (!relationSaveResult) {
+ return Result.error("淇濆瓨鍏宠仈鍏崇郴澶辫触");
+ }
+ }
+ }
+ Map<String, Object> result = new HashMap<>();
+ result.put("message", "鎻愪氦鎴愬姛");
+ result.put("totalSubmitted", totalSubmitted);
+ return Result.ok("鎻愪氦鎴愬姛");
+ } catch (Exception e) {
+ log.error("鎻愪氦鍏ュ簱鍗曞け璐ワ紝orderId: " + orderId, e);
+ return Result.error("鎻愪氦澶辫触: " + e.getMessage());
+ }
+ }
}
+
+
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java
index 92024f7..630d7e6 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingInventoryController.java
@@ -3,15 +3,11 @@
import java.util.Arrays;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-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.system.query.QueryGenerator;
-import org.jeecg.common.util.oConvertUtils;
import org.jeecg.modules.cms.entity.CuttingInventory;
import org.jeecg.modules.cms.service.ICuttingInventoryService;
@@ -20,141 +16,133 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.extern.slf4j.Slf4j;
-import org.jeecgframework.poi.excel.ExcelImportUtil;
-import org.jeecgframework.poi.excel.def.NormalExcelConstants;
-import org.jeecgframework.poi.excel.entity.ExportParams;
-import org.jeecgframework.poi.excel.entity.ImportParams;
-import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
import org.jeecg.common.system.base.controller.JeecgController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.servlet.ModelAndView;
-import com.alibaba.fastjson.JSON;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.jeecg.common.aspect.annotation.AutoLog;
- /**
+/**
* @Description: 鍒�鍏峰簱瀛�
* @Author: jeecg-boot
- * @Date: 2025-07-28
+ * @Date: 2025-07-28
* @Version: V1.0
*/
-@Api(tags="鍒�鍏峰簱瀛�")
+@Api(tags = "鍒�鍏峰簱瀛�")
@RestController
@RequestMapping("/cms/cuttingInventory")
@Slf4j
public class CuttingInventoryController extends JeecgController<CuttingInventory, ICuttingInventoryService> {
- @Autowired
- private ICuttingInventoryService cuttingInventoryService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param cuttingInventory
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CuttingInventory>> queryPageList(CuttingInventory cuttingInventory,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CuttingInventory> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInventory, req.getParameterMap());
- Page<CuttingInventory> page = new Page<CuttingInventory>(pageNo, pageSize);
- IPage<CuttingInventory> pageList = cuttingInventoryService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param cuttingInventory
- * @return
- */
- @AutoLog(value = "鍒�鍏峰簱瀛�-娣诲姞")
- @ApiOperation(value="鍒�鍏峰簱瀛�-娣诲姞", notes="鍒�鍏峰簱瀛�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody CuttingInventory cuttingInventory) {
- cuttingInventoryService.save(cuttingInventory);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param cuttingInventory
- * @return
- */
- @AutoLog(value = "鍒�鍏峰簱瀛�-缂栬緫")
- @ApiOperation(value="鍒�鍏峰簱瀛�-缂栬緫", notes="鍒�鍏峰簱瀛�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CuttingInventory cuttingInventory) {
- cuttingInventoryService.updateById(cuttingInventory);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎", notes="鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cuttingInventoryService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎", notes="鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cuttingInventoryService.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<CuttingInventory> queryById(@RequestParam(name="id",required=true) String id) {
- CuttingInventory cuttingInventory = cuttingInventoryService.getById(id);
- if(cuttingInventory==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(cuttingInventory);
- }
+ @Autowired
+ private ICuttingInventoryService cuttingInventoryService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param cuttingInventory
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param cuttingInventory
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏峰簱瀛�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CuttingInventory>> queryPageList(CuttingInventory cuttingInventory,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CuttingInventory> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInventory, req.getParameterMap());
+ Page<CuttingInventory> page = new Page<CuttingInventory>(pageNo, pageSize);
+ IPage<CuttingInventory> pageList = cuttingInventoryService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param cuttingInventory
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰簱瀛�-娣诲姞")
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-娣诲姞", notes = "鍒�鍏峰簱瀛�-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody CuttingInventory cuttingInventory) {
+ cuttingInventoryService.save(cuttingInventory);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param cuttingInventory
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰簱瀛�-缂栬緫")
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-缂栬緫", notes = "鍒�鍏峰簱瀛�-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CuttingInventory cuttingInventory) {
+ cuttingInventoryService.updateById(cuttingInventory);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎", notes = "鍒�鍏峰簱瀛�-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cuttingInventoryService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎", notes = "鍒�鍏峰簱瀛�-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cuttingInventoryService.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<CuttingInventory> queryById(@RequestParam(name = "id", required = true) String id) {
+ CuttingInventory cuttingInventory = cuttingInventoryService.getById(id);
+ if (cuttingInventory == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(cuttingInventory);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param cuttingInventory
+ */
//@RequiresPermissions("org.jeecg.modules:cms_cutting_inventory:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CuttingInventory cuttingInventory) {
@@ -162,16 +150,30 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_cutting_inventory:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CuttingInventory.class);
}
+ /**
+ * 鍒�鍏峰簱瀛樼粺璁�
+ */
+ @ApiOperation(value = "鍒�鍏峰簱瀛�-缁熻鍒嗛〉鏌ヨ", notes = "鍒�鍏峰簱瀛�-缁熻鍒嗛〉鏌ヨ")
+ @GetMapping(value = "/statistics")
+ public Result<IPage<Map<String, Object>>> statistics(
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
+
+ Page<Map<String, Object>> page = new Page<>(pageNo, pageSize);
+ IPage<Map<String, Object>> pageList = cuttingInventoryService.statisticsByCuttingIdAndStatus(page);
+ return Result.OK(pageList);
+ }
+
}
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
index 4b6649c..f9c7d7b 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInventory.java
@@ -55,6 +55,7 @@
/**鍒�鍏稩D*/
@Excel(name = "鍒�鍏稩D", width = 15)
@ApiModelProperty(value = "鍒�鍏稩D")
+ @Dict(dictTable = "cms_cutting_tool",dicCode="id",dicText = "cutting_code")
private String cuttingId;
/**鍒�鍏锋潯鐮�*/
@Excel(name = "鍒�鍏锋潯鐮�", width = 15)
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/CuttingInventoryMapper.java b/src/main/java/org/jeecg/modules/cms/mapper/CuttingInventoryMapper.java
index 6a98599..551ea83 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/CuttingInventoryMapper.java
+++ b/src/main/java/org/jeecg/modules/cms/mapper/CuttingInventoryMapper.java
@@ -1,8 +1,9 @@
package org.jeecg.modules.cms.mapper;
-import java.util.List;
+import java.util.Map;
-import org.apache.ibatis.annotations.Param;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.cms.entity.CuttingInventory;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
@@ -13,5 +14,4 @@
* @Version: V1.0
*/
public interface CuttingInventoryMapper extends BaseMapper<CuttingInventory> {
-
-}
+ IPage<Map<String, Object>> statisticsByCuttingIdAndStatus(Page<Map<String, Object>> page);}
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
index 90c6061..0c9424a 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInventoryMapper.xml
@@ -1,5 +1,15 @@
<?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.cms.mapper.CuttingInventoryMapper">
-
+ <select id="statisticsByCuttingIdAndStatus" resultType="map">
+ SELECT
+ t1.cutting_id as cuttingId,
+ count(*) AS cuttingIdNumber,
+ t1.inventory_status as inventoryStatus,
+ t2.cutting_code AS cuttingCode
+ FROM
+ cms_cutting_inventory t1
+ LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id AND t2.del_flag = 0
+ GROUP BY cutting_id, inventory_status, cutting_code
+ </select>
</mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
index c34fa1d..836a042 100644
--- a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
+++ b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundDetailService.java
@@ -15,4 +15,5 @@
public interface ICuttingInboundDetailService extends IService<CuttingInboundDetail> {
public List<Map<String, Object>> detailList(String orderId);
+
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
index 3cdc08a..c01d8f1 100644
--- a/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
+++ b/src/main/java/org/jeecg/modules/cms/service/ICuttingInboundService.java
@@ -1,7 +1,11 @@
package org.jeecg.modules.cms.service;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInbound;
import com.baomidou.mybatisplus.extension.service.IService;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
+
+import java.util.List;
/**
* @Description: 鍒�鍏峰叆搴撳崟
@@ -10,5 +14,5 @@
* @Version: V1.0
*/
public interface ICuttingInboundService extends IService<CuttingInbound> {
-
+ Result<?> importExcelData(List<CuttingInboundExportVo> list);
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/ICuttingInventoryService.java b/src/main/java/org/jeecg/modules/cms/service/ICuttingInventoryService.java
index 10cea17..5c4098a 100644
--- a/src/main/java/org/jeecg/modules/cms/service/ICuttingInventoryService.java
+++ b/src/main/java/org/jeecg/modules/cms/service/ICuttingInventoryService.java
@@ -1,7 +1,12 @@
package org.jeecg.modules.cms.service;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.cms.entity.CuttingInventory;
import com.baomidou.mybatisplus.extension.service.IService;
+
+import java.util.List;
+import java.util.Map;
/**
* @Description: 鍒�鍏峰簱瀛�
@@ -11,4 +16,6 @@
*/
public interface ICuttingInventoryService extends IService<CuttingInventory> {
+ IPage<Map<String, Object>> statisticsByCuttingIdAndStatus(Page<Map<String, Object>> page);
+
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
index 4ca9708..991f67f 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInboundServiceImpl.java
@@ -1,11 +1,20 @@
package org.jeecg.modules.cms.service.impl;
+import org.jeecg.common.api.vo.Result;
import org.jeecg.modules.cms.entity.CuttingInbound;
+import org.jeecg.modules.cms.entity.CuttingInboundDetail;
import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
import org.jeecg.modules.cms.service.ICuttingInboundService;
+import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
/**
* @Description: 鍒�鍏峰叆搴撳崟
@@ -15,5 +24,76 @@
*/
@Service
public class CuttingInboundServiceImpl extends ServiceImpl<CuttingInboundMapper, CuttingInbound> implements ICuttingInboundService {
+ @Autowired
+ private ICuttingInboundDetailService cuttingInboundDetailService; // 娉ㄥ叆浠庤〃鏈嶅姟
+ /**
+ * 閫氳繃Excel瀵煎叆鍒�鍏峰叆搴撳崟鏁版嵁
+ *
+ * @param list 寰呭鍏ョ殑鏁版嵁鍒楄〃
+ * @return 瀵煎叆缁撴灉
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> importExcelData(List<CuttingInboundExportVo> list) {
+// try {
+// for (CuttingInboundExportVo exportVo : list) {
+// // 淇濆瓨涓昏〃鏁版嵁
+// CuttingInbound cuttingInbound = new CuttingInbound();
+// cuttingInbound.setReceiver(exportVo.getReceiver());
+// cuttingInbound.setReceiveTime(exportVo.getReceiveTime());
+// cuttingInbound.setReceiveComment(exportVo.getReceiveComment());
+// cuttingInbound.setConfirmer(exportVo.getConfirmer());
+// cuttingInbound.setConfirmTime(exportVo.getConfirmTime());
+// cuttingInbound.setConfirmComment(exportVo.getConfirmComment());
+// cuttingInbound.setOrderStatus(exportVo.getOrderStatus());
+//
+// // 淇濆瓨涓昏〃鏁版嵁浠ヨ幏鍙朓D
+// this.save(cuttingInbound);
+//
+// // 鑾峰彇涓昏〃ID
+// String orderId = cuttingInbound.getId();
+//
+// // 澶勭悊浠庤〃鏁版嵁
+// List<CuttingInboundDetail> detailList = exportVo.getDetailList();
+// if (detailList != null && !detailList.isEmpty()) {
+// for (CuttingInboundDetail detail : detailList) {
+// detail.setOrderId(orderId); // 璁剧疆澶栭敭鍏宠仈
+// cuttingInboundDetailService.save(detail);
+// }
+// }
+// }
+// return Result.ok("瀵煎叆鎴愬姛");
+// } catch (Exception e) {
+// log.error("瀵煎叆澶辫触", e);
+// return Result.error("瀵煎叆澶辫触: " + e.getMessage());
+// }
+// }
+ for (CuttingInboundExportVo exportVo : list) {
+ // 淇濆瓨涓昏〃鏁版嵁
+ CuttingInbound cuttingInbound = new CuttingInbound();
+ cuttingInbound.setReceiver(exportVo.getReceiver());
+ cuttingInbound.setReceiveTime(exportVo.getReceiveTime());
+ cuttingInbound.setReceiveComment(exportVo.getReceiveComment());
+ cuttingInbound.setConfirmer(exportVo.getConfirmer());
+ cuttingInbound.setConfirmTime(exportVo.getConfirmTime());
+ cuttingInbound.setConfirmComment(exportVo.getConfirmComment());
+ cuttingInbound.setOrderStatus(exportVo.getOrderStatus());
+ // 淇濆瓨涓昏〃鏁版嵁浠ヨ幏鍙朓D
+ this.save(cuttingInbound);
+
+ // 鑾峰彇涓昏〃ID
+ String orderId = cuttingInbound.getId();
+
+ // 澶勭悊浠庤〃鏁版嵁
+ List<CuttingInboundDetail> detailList = exportVo.getDetailList();
+ if (detailList != null && !detailList.isEmpty()) {
+ for (CuttingInboundDetail detail : detailList) {
+ detail.setOrderId(orderId); // 璁剧疆澶栭敭鍏宠仈
+ cuttingInboundDetailService.save(detail);
+ }
+ }
+ }
+ return Result.ok("瀵煎叆鎴愬姛");
+ }
}
diff --git a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
index 2e3fcd1..f5adc82 100644
--- a/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/cms/service/impl/CuttingInventoryServiceImpl.java
@@ -1,11 +1,21 @@
package org.jeecg.modules.cms.service.impl;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.jeecg.modules.cms.entity.CuttingInventory;
import org.jeecg.modules.cms.mapper.CuttingInventoryMapper;
+import org.jeecg.modules.cms.mapper.CuttingToolMapper;
import org.jeecg.modules.cms.service.ICuttingInventoryService;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @Description: 鍒�鍏峰簱瀛�
@@ -15,5 +25,9 @@
*/
@Service
public class CuttingInventoryServiceImpl extends ServiceImpl<CuttingInventoryMapper, CuttingInventory> implements ICuttingInventoryService {
-
+ @Override
+ public IPage<Map<String, Object>> statisticsByCuttingIdAndStatus(Page<Map<String, Object>> page) { // 鎵ц鍒嗛〉缁熻鏌ヨ
+ IPage<Map<String, Object>> result = baseMapper.statisticsByCuttingIdAndStatus(page);
+ return result;
+ }
}
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
index 0a788fb..e871cce 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesProductionWorkOrderServiceImpl.java
@@ -9,6 +9,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.modules.base.entity.Factory;
import org.jeecg.modules.base.entity.LineSideWarehouse;
import org.jeecg.modules.base.entity.Shift;
@@ -28,6 +29,7 @@
import org.jeecg.modules.mes.service.IMesProductionWorkOrderService;
import org.jeecg.modules.mes.entity.MesProductionWorkOrder;
import org.jeecg.modules.mes.mapper.MesProductionWorkOrderMapper;
+import org.jeecg.modules.mes.utils.CommonUtils;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterials;
import org.jeecg.modules.pms.entity.PmsProcessBillMaterialsDetail;
import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsDetailService;
@@ -135,10 +137,28 @@
@Override
public IPage<MesProductionWorkOrder> queryPageList(Page<MesProductionWorkOrder> page, Map<String, String[]> parameterMap) {
QueryWrapper<MesProductionWorkOrder> queryWrapper = Wrappers.query();
+
+ LoginUser loginUser = CommonUtils.getCurrentUser();
+ if (loginUser == null) {
+ return page;
+ }
+ queryWrapper.exists("select 1 from base_user_factory t where t.user_id = {0} and t.factory_id = t1.factory_id", loginUser.getId());
String[] factoryIds = parameterMap.get("factoryId");
if (factoryIds != null && factoryIds.length > 0) {
queryWrapper.eq("t1.factory_id", factoryIds[0]);
}
+ String[] materialNumbers = parameterMap.get("materialNumber");
+ if (materialNumbers != null && materialNumbers.length > 0) {
+ queryWrapper.like("t1.material_number", materialNumbers[0]);
+ }
+ String[] materialNames = parameterMap.get("materialName");
+ if (materialNames != null && materialNames.length > 0) {
+ queryWrapper.like("t1.material_name", materialNames[0]);
+ }
+ String[] workOrderCodes = parameterMap.get("workOrderCode");
+ if (workOrderCodes != null && workOrderCodes.length > 0) {
+ queryWrapper.like("t1.work_order_code", workOrderCodes[0]);
+ }
String[] startDates = parameterMap.get("startDate");
String[] endDates = parameterMap.get("endDate");
if (startDates != null && startDates.length > 0) {
--
Gitblit v1.9.3