From 86565eefc5c2fa9be6a00db58d1079c6d0d908ac Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期一, 15 九月 2025 17:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java | 282 +++++++++++++++---------------
src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml | 15 +
src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java | 231 ++++++++++++------------
3 files changed, 269 insertions(+), 259 deletions(-)
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
index 9fe8b9f..8c84412 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapController.java
@@ -43,141 +43,141 @@
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/cuttingScrap")
@Slf4j
public class CuttingScrapController extends JeecgController<CuttingScrap, ICuttingScrapService> {
- @Autowired
- private ICuttingScrapService cuttingScrapService;
+ @Autowired
+ private ICuttingScrapService cuttingScrapService;
- @Autowired
- private ICuttingScrapDetailService cuttingScrapDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param cuttingScrap
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CuttingScrap>> queryPageList(CuttingScrap cuttingScrap,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CuttingScrap> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrap, req.getParameterMap());
- Page<CuttingScrap> page = new Page<CuttingScrap>(pageNo, pageSize);
- IPage<CuttingScrap> pageList = cuttingScrapService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param jSONObject
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴�-娣诲姞")
- @ApiOperation(value="鍒�鍏锋姤搴�-娣诲姞", notes="鍒�鍏锋姤搴�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody JSONObject jSONObject) {
- CuttingScrap cuttingScrap = jSONObject.toJavaObject(CuttingScrap.class);
- cuttingScrap.setOrderStatus("1");
- cuttingScrapService.saveOrUpdate(cuttingScrap);
- //鍒犻櫎鍘熷叧鑱旀暟鎹�
- List<CuttingScrapDetail> cuttingScrapDetailList = cuttingScrapDetailService.lambdaQuery().eq(CuttingScrapDetail::getOrderId,cuttingScrap.getId()).list();
- cuttingScrapDetailService.removeBatchByIds(cuttingScrapDetailList);
- //娣诲姞鏂板叧鑱旀暟鎹�
- JSONArray jsonArray = jSONObject.getJSONArray("detailData");
- List<CuttingScrapDetail> list = jsonArray.toJavaList(CuttingScrapDetail.class);
- for (int i = 0; i < list.size(); i++) {
- CuttingScrapDetail temp = list.get(i);
- temp.setOrderId(cuttingScrap.getId());
- cuttingScrapDetailService.save(temp);
- }
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param cuttingScrap
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴�-缂栬緫")
- @ApiOperation(value="鍒�鍏锋姤搴�-缂栬緫", notes="鍒�鍏锋姤搴�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CuttingScrap cuttingScrap) {
- cuttingScrapService.updateById(cuttingScrap);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎", notes="鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cuttingScrapService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍒�鍏锋姤搴�-鎵归噺鍒犻櫎", notes="鍒�鍏锋姤搴�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cuttingScrapService.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<CuttingScrap> queryById(@RequestParam(name="id",required=true) String id) {
- CuttingScrap cuttingScrap = cuttingScrapService.getById(id);
- if(cuttingScrap==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(cuttingScrap);
- }
+ @Autowired
+ private ICuttingScrapDetailService cuttingScrapDetailService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param cuttingScrap
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param cuttingScrap
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏锋姤搴�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CuttingScrap>> queryPageList(CuttingScrap cuttingScrap,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CuttingScrap> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrap, req.getParameterMap());
+ Page<CuttingScrap> page = new Page<CuttingScrap>(pageNo, pageSize);
+ IPage<CuttingScrap> pageList = cuttingScrapService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param jSONObject
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴�-娣诲姞")
+ @ApiOperation(value = "鍒�鍏锋姤搴�-娣诲姞", notes = "鍒�鍏锋姤搴�-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody JSONObject jSONObject) {
+ CuttingScrap cuttingScrap = jSONObject.toJavaObject(CuttingScrap.class);
+ cuttingScrap.setOrderStatus("1");
+ cuttingScrapService.saveOrUpdate(cuttingScrap);
+ //鍒犻櫎鍘熷叧鑱旀暟鎹�
+ List<CuttingScrapDetail> cuttingScrapDetailList = cuttingScrapDetailService.lambdaQuery().eq(CuttingScrapDetail::getOrderId, cuttingScrap.getId()).list();
+ cuttingScrapDetailService.removeBatchByIds(cuttingScrapDetailList);
+ //娣诲姞鏂板叧鑱旀暟鎹�
+ JSONArray jsonArray = jSONObject.getJSONArray("detailData");
+ List<CuttingScrapDetail> list = jsonArray.toJavaList(CuttingScrapDetail.class);
+
+ for (CuttingScrapDetail temp : list) {
+ temp.setOrderId(cuttingScrap.getId());
+ cuttingScrapDetailService.save(temp);
+ }
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param cuttingScrap
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴�-缂栬緫")
+ @ApiOperation(value = "鍒�鍏锋姤搴�-缂栬緫", notes = "鍒�鍏锋姤搴�-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CuttingScrap cuttingScrap) {
+ cuttingScrapService.updateById(cuttingScrap);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎", notes = "鍒�鍏锋姤搴�-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cuttingScrapService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏锋姤搴�-鎵归噺鍒犻櫎", notes = "鍒�鍏锋姤搴�-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cuttingScrapService.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<CuttingScrap> queryById(@RequestParam(name = "id", required = true) String id) {
+ CuttingScrap cuttingScrap = cuttingScrapService.getById(id);
+ if (cuttingScrap == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(cuttingScrap);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param cuttingScrap
+ */
//@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CuttingScrap cuttingScrap) {
@@ -185,28 +185,28 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_cutting_scrap:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
return super.importExcel(request, response, CuttingScrap.class);
}
- /**
- * 鏍规嵁鎶ュ簾id鏌ヨ鎶ュ簾鏄庣粏
- *
- * @param orderId
- * @return
- */
- @GetMapping("/detailList")
- public Result<?> detailList(@RequestParam("orderId") String orderId) {
- List<Map<String, Object>> list = cuttingScrapDetailService.detailList(orderId);
- return Result.ok(list);
- }
+ /**
+ * 鏍规嵁鎶ュ簾id鏌ヨ鎶ュ簾鏄庣粏
+ *
+ * @param orderId
+ * @return
+ */
+ @GetMapping("/detailList")
+ public Result<?> detailList(@RequestParam("orderId") String orderId) {
+ List<Map<String, Object>> list = cuttingScrapDetailService.detailList(orderId);
+ return Result.ok(list);
+ }
}
diff --git a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java
index 8c074ab..7e2e97f 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingScrapDetailController.java
@@ -9,6 +9,7 @@
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;
@@ -36,125 +37,125 @@
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/cuttingScrapDetail")
@Slf4j
public class CuttingScrapDetailController extends JeecgController<CuttingScrapDetail, ICuttingScrapDetailService> {
- @Autowired
- private ICuttingScrapDetailService cuttingScrapDetailService;
-
- /**
- * 鍒嗛〉鍒楄〃鏌ヨ
- *
- * @param cuttingScrapDetail
- * @param pageNo
- * @param pageSize
- * @param req
- * @return
- */
- //@AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @ApiOperation(value="鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
- @GetMapping(value = "/list")
- public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
- @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
- @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
- HttpServletRequest req) {
- QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
- Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
- IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
- return Result.OK(pageList);
- }
-
- /**
- * 娣诲姞
- *
- * @param cuttingScrapDetail
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-娣诲姞")
- @ApiOperation(value="鍒�鍏锋姤搴熸槑缁�-娣诲姞", notes="鍒�鍏锋姤搴熸槑缁�-娣诲姞")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
- @PostMapping(value = "/add")
- public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
- cuttingScrapDetailService.save(cuttingScrapDetail);
- return Result.OK("娣诲姞鎴愬姛锛�");
- }
-
- /**
- * 缂栬緫
- *
- * @param cuttingScrapDetail
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-缂栬緫")
- @ApiOperation(value="鍒�鍏锋姤搴熸槑缁�-缂栬緫", notes="鍒�鍏锋姤搴熸槑缁�-缂栬緫")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
- @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
- public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
- cuttingScrapDetailService.updateById(cuttingScrapDetail);
- return Result.OK("缂栬緫鎴愬姛!");
- }
-
- /**
- * 閫氳繃id鍒犻櫎
- *
- * @param id
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎")
- @ApiOperation(value="鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎", notes="鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
- @DeleteMapping(value = "/delete")
- public Result<String> delete(@RequestParam(name="id",required=true) String id) {
- cuttingScrapDetailService.removeById(id);
- return Result.OK("鍒犻櫎鎴愬姛!");
- }
-
- /**
- * 鎵归噺鍒犻櫎
- *
- * @param ids
- * @return
- */
- @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎")
- @ApiOperation(value="鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎", notes="鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎")
- //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
- @DeleteMapping(value = "/deleteBatch")
- public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
- this.cuttingScrapDetailService.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<CuttingScrapDetail> queryById(@RequestParam(name="id",required=true) String id) {
- CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
- if(cuttingScrapDetail==null) {
- return Result.error("鏈壘鍒板搴旀暟鎹�");
- }
- return Result.OK(cuttingScrapDetail);
- }
+ @Autowired
+ private ICuttingScrapDetailService cuttingScrapDetailService;
/**
- * 瀵煎嚭excel
- *
- * @param request
- * @param cuttingScrapDetail
- */
+ * 鍒嗛〉鍒楄〃鏌ヨ
+ *
+ * @param cuttingScrapDetail
+ * @param pageNo
+ * @param pageSize
+ * @param req
+ * @return
+ */
+ //@AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
+ @ApiOperation(value = "鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏锋姤搴熸槑缁�-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/list")
+ public Result<IPage<CuttingScrapDetail>> queryPageList(CuttingScrapDetail cuttingScrapDetail,
+ @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+ @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<CuttingScrapDetail> queryWrapper = QueryGenerator.initQueryWrapper(cuttingScrapDetail, req.getParameterMap());
+ Page<CuttingScrapDetail> page = new Page<CuttingScrapDetail>(pageNo, pageSize);
+ IPage<CuttingScrapDetail> pageList = cuttingScrapDetailService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 娣诲姞
+ *
+ * @param cuttingScrapDetail
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-娣诲姞")
+ @ApiOperation(value = "鍒�鍏锋姤搴熸槑缁�-娣诲姞", notes = "鍒�鍏锋姤搴熸槑缁�-娣诲姞")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:add")
+ @PostMapping(value = "/add")
+ public Result<String> add(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
+ cuttingScrapDetailService.save(cuttingScrapDetail);
+ return Result.OK("娣诲姞鎴愬姛锛�");
+ }
+
+ /**
+ * 缂栬緫
+ *
+ * @param cuttingScrapDetail
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-缂栬緫")
+ @ApiOperation(value = "鍒�鍏锋姤搴熸槑缁�-缂栬緫", notes = "鍒�鍏锋姤搴熸槑缁�-缂栬緫")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:edit")
+ @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+ public Result<String> edit(@RequestBody CuttingScrapDetail cuttingScrapDetail) {
+ cuttingScrapDetailService.updateById(cuttingScrapDetail);
+ return Result.OK("缂栬緫鎴愬姛!");
+ }
+
+ /**
+ * 閫氳繃id鍒犻櫎
+ *
+ * @param id
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎", notes = "鍒�鍏锋姤搴熸槑缁�-閫氳繃id鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:delete")
+ @DeleteMapping(value = "/delete")
+ public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+ cuttingScrapDetailService.removeById(id);
+ return Result.OK("鍒犻櫎鎴愬姛!");
+ }
+
+ /**
+ * 鎵归噺鍒犻櫎
+ *
+ * @param ids
+ * @return
+ */
+ @AutoLog(value = "鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎")
+ @ApiOperation(value = "鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎", notes = "鍒�鍏锋姤搴熸槑缁�-鎵归噺鍒犻櫎")
+ //@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:deleteBatch")
+ @DeleteMapping(value = "/deleteBatch")
+ public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+ this.cuttingScrapDetailService.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<CuttingScrapDetail> queryById(@RequestParam(name = "id", required = true) String id) {
+ CuttingScrapDetail cuttingScrapDetail = cuttingScrapDetailService.getById(id);
+ if (cuttingScrapDetail == null) {
+ return Result.error("鏈壘鍒板搴旀暟鎹�");
+ }
+ return Result.OK(cuttingScrapDetail);
+ }
+
+ /**
+ * 瀵煎嚭excel
+ *
+ * @param request
+ * @param cuttingScrapDetail
+ */
//@RequiresPermissions("org.jeecg.modules:cms_cutting_scrap_detail:exportXls")
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, CuttingScrapDetail cuttingScrapDetail) {
@@ -162,12 +163,12 @@
}
/**
- * 閫氳繃excel瀵煎叆鏁版嵁
- *
- * @param request
- * @param response
- * @return
- */
+ * 閫氳繃excel瀵煎叆鏁版嵁
+ *
+ * @param request
+ * @param response
+ * @return
+ */
//@RequiresPermissions("cms_cutting_scrap_detail:importExcel")
@RequestMapping(value = "/importExcel", method = RequestMethod.POST)
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
index d6f927e..16423f4 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingScrapDetailMapper.xml
@@ -7,11 +7,20 @@
t1.id,
t1.order_id orderId,
t1.cutting_id cuttingId,
- t2.cutting_code cuttingCode,
- t2.cutting_name cuttingName
+ t1.inventory_id inventoryId,
+ -- t1.workpiece_material workpieceMaterial,
+ -- t1.used_life usedLife,
+ t2.cutting_barcode cuttingBarcode,
+ t2.inventory_status inventoryStatus,
+ t2.current_life currentLife,
+ t2.id,
+ t3.id,
+ t3.cutting_code cuttingCode,
+ t3.cutting_name cuttingName
FROM
cms_cutting_scrap_detail t1
- LEFT JOIN cms_cutting_tool t2 ON t1.cutting_id = t2.id
+ LEFT JOIN cms_cutting_inventory t2 ON t1.inventory_id = t2.id
+ LEFT JOIN cms_cutting_tool t3 ON t1.cutting_id = t3.id
WHERE t1.order_id = #{orderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3