From 23855599412c4d61b38d78f0f3abd3430a48b5b1 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 25 六月 2025 11:51:38 +0800
Subject: [PATCH] Merge branch 'mdc_hyjs_master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 209 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java
new file mode 100644
index 0000000..828cdbc
--- /dev/null
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamSparePartScrapController.java
@@ -0,0 +1,209 @@
+package org.jeecg.modules.eam.controller;
+
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.SecurityUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.exception.JeecgBootException;
+import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.aspect.annotation.AutoLog;
+import org.jeecg.common.system.vo.LoginUser;
+import org.jeecg.modules.eam.constant.BusinessCodeConst;
+import org.jeecg.modules.eam.entity.EamSparePartInventory;
+import org.jeecg.modules.eam.entity.EamSparePartReceive;
+import org.jeecg.modules.eam.entity.EamSparePartReceiveDetail;
+import org.jeecg.modules.eam.entity.EamSparePartScrap;
+import org.jeecg.modules.eam.service.IEamSparePartInventoryService;
+import org.jeecg.modules.eam.service.IEamSparePartScrapService;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.system.base.controller.JeecgController;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.servlet.ModelAndView;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * @Description: 澶囧搧澶囦欢鎶ュ簾
+ * @Author: Lius
+ * @Date: 2025-03-19
+ * @Version: V1.0
+ */
+@Slf4j
+@Api(tags = "澶囧搧澶囦欢鎶ュ簾")
+@RestController
+@RequestMapping("/eam/eamSparePartScrap")
+public class EamSparePartScrapController extends JeecgController<EamSparePartScrap, IEamSparePartScrapService> {
+
+ @Resource
+ private IEamSparePartScrapService eamSparePartScrapService;
+
+ @Resource
+ private IEamSparePartInventoryService eamSparePartInventoryService;
+
+ /**
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param eamSparePartScrap
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-鍒嗛〉鍒楄〃鏌ヨ", notes = "澶囧搧澶囦欢鎶ュ簾-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<?> queryPageList(EamSparePartScrap eamSparePartScrap,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+// QueryWrapper<EamSparePartScrap> queryWrapper = QueryGenerator.initQueryWrapper(eamSparePartScrap, req.getParameterMap());
+ QueryWrapper<EamSparePartScrap> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(eamSparePartScrap.getScrapCode())){
+ queryWrapper.like("t1.scrap_code",eamSparePartScrap.getScrapCode());
+ }
+ if(StringUtils.isNotBlank(eamSparePartScrap.getPartName())){
+ queryWrapper.like("t2.part_name",eamSparePartScrap.getPartName());
+ }
+ queryWrapper.eq("t1.del_flag","0");
+ queryWrapper.orderByDesc("t1.create_time");
+ Page<EamSparePartScrap> page = new Page<EamSparePartScrap>(pageNo, pageSize);
+ IPage<EamSparePartScrap> pageList = eamSparePartScrapService.queryPageList(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param eamSparePartScrap
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-娣诲姞", notes = "澶囧搧澶囦欢鎶ュ簾-娣诲姞")
+ @PostMapping(value = "/add")
+ public Result<?> add(@RequestBody EamSparePartScrap eamSparePartScrap) {
+ LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ eamSparePartScrap.setScrapStatus(BusinessCodeConst.scrap_status_1);
+ eamSparePartScrap.setReportUser(user.getRealname());
+ eamSparePartScrapService.save(eamSparePartScrap);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param eamSparePartScrap
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-缂栬緫", notes = "澶囧搧澶囦欢鎶ュ簾-缂栬緫")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<?> edit(@RequestBody EamSparePartScrap eamSparePartScrap) {
+ eamSparePartScrapService.updateById(eamSparePartScrap);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 澶囦欢鎶ュ簾-纭
+ *
+ * @return
+ */
+ @AutoLog(value = "澶囦欢鎶ュ簾-纭")
+ @ApiOperation(value = "澶囦欢鎶ュ簾-纭", notes = "澶囦欢鎶ュ簾-纭")
+ @PostMapping(value = "/confirm")
+ @Transactional(rollbackFor = Exception.class)
+ public Result<?> confirmSparePartScrap(@RequestBody EamSparePartScrap eamSparePartScrap) {
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ throw new JeecgBootException("褰撳墠鐢ㄦ埛鏃犳硶纭澶囦欢鎶ュ簾锛�");
+ }
+
+ eamSparePartScrap.setApprovalUser(sysUser.getRealname());
+ eamSparePartScrap.setApprovalTime(new Date());
+ eamSparePartScrap.setScrapStatus(BusinessCodeConst.scrap_status_2);
+ boolean b = eamSparePartScrapService.updateById(eamSparePartScrap);
+ if (!b) {
+ return Result.error("纭鎶ュ簾澶辫触锛�");
+ }else{
+ EamSparePartInventory eamSparePartInventory = new EamSparePartInventory();
+ eamSparePartInventory.setSparePartId(eamSparePartScrap.getSparePartsId());
+ eamSparePartInventory.setInventory(eamSparePartScrap.getScrapNum().negate());
+ eamSparePartInventory.setSparePartIntoType("4");//搴撳瓨鏉ユ簮绫诲瀷 1.鍏ュ簱 2.棰嗘枡鍑哄簱 3.褰掕繕鍏ュ簱 4.鎶ュ簾鍑哄簱
+ eamSparePartInventoryService.save(eamSparePartInventory);
+ return Result.OK("纭鎶ュ簾鎴愬姛!");
+ }
+
+ }
+
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鍒犻櫎", notes = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鍒犻櫎")
+ @DeleteMapping(value = "/delete")
+ public Result<?> delete(@RequestParam(name = "id", required = true) String id) {
+ eamSparePartScrapService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-鎵归噺鍒犻櫎", notes = "澶囧搧澶囦欢鎶ュ簾-鎵归噺鍒犻櫎")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<?> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.eamSparePartScrapService.removeByIds(Arrays.asList(ids.split(",")));
+ return Result.OK("鎵归噺鍒犻櫎鎴愬姛锛�");
+ }
+
+ /**
+ * 閫氳繃id鏌ヨ
+ *
+ * @param id
+ * @return
+ */
+ @ApiOperation(value = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鏌ヨ", notes = "澶囧搧澶囦欢鎶ュ簾-閫氳繃id鏌ヨ")
+ @GetMapping(value = "/queryById")
+ public Result<?> queryById(@RequestParam(name = "id", required = true) String id) {
+ EamSparePartScrap eamSparePartScrap = eamSparePartScrapService.getById(id);
+ return Result.OK(eamSparePartScrap);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param eamSparePartScrap
+ */
+ @RequestMapping(value = "/exportXls")
+ public ModelAndView exportXls(HttpServletRequest request, EamSparePartScrap eamSparePartScrap) {
+ return super.exportXls(request, eamSparePartScrap, EamSparePartScrap.class, "澶囧搧澶囦欢鎶ュ簾");
+ }
+
+ /**
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
+ @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
+ public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
+ return super.importExcel(request, response, EamSparePartScrap.class);
+ }
+
+}
--
Gitblit v1.9.3