From 182c04e399f5db26406234767f7ef34b5adc0015 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 20 八月 2025 18:19:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java |   43 +++
 db/双林新火炬MES数据库设计.pdma.json                                                        |    4 
 .gitignore                                                                        |    1 
 src/main/java/org/jeecg/modules/cms/mapper/CuttingInboundMapper.java              |    5 
 src/main/java/org/jeecg/modules/qms/enums/PlanCategoryEnum.java                   |   16 +
 src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java      |  385 ++++++++++++++++++++--------------
 src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml           |   18 +
 src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java    |    6 
 src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java            |    2 
 src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java         |    2 
 src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java              |    2 
 src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java                  |    6 
 src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java                |  117 ++++++++++
 13 files changed, 436 insertions(+), 171 deletions(-)

diff --git a/.gitignore b/.gitignore
index b7838ca..a8837ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@
 os_del_doc.cmd
 .svn
 derby.log
+.gitignore
\ No newline at end of file
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 f55f7b8..f04ecb8 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"
@@ -632,7 +632,7 @@
       "#DDE5FF"
     ],
     "DDLToggleCase": "L",
-    "menuWidth": "364px"
+    "menuWidth": "304px"
   },
   "entities": [
     {
@@ -64807,7 +64807,7 @@
           "notNull": false,
           "autoIncrement": false,
           "defaultValue": "",
-          "hideInGraph": true,
+          "hideInGraph": false,
           "refDict": "",
           "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64",
           "extProps": {},
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 fea2c84..5b702de 100644
--- a/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
+++ b/src/main/java/org/jeecg/modules/cms/controller/CuttingInboundController.java
@@ -1,13 +1,6 @@
 package org.jeecg.modules.cms.controller;
 
-import java.util.ArrayList;
-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 java.util.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,9 +8,9 @@
 import com.alibaba.fastjson.JSONObject;
 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.CuttingInbound;
 import org.jeecg.modules.cms.entity.CuttingInboundDetail;
+import org.jeecg.modules.cms.mapper.CuttingInboundMapper;
 import org.jeecg.modules.cms.service.ICuttingInboundDetailService;
 import org.jeecg.modules.cms.service.ICuttingInboundService;
 
@@ -26,186 +19,260 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 
-import org.jeecgframework.poi.excel.ExcelImportUtil;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
 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/cuttingInbound")
 @Slf4j
 public class CuttingInboundController extends JeecgController<CuttingInbound, ICuttingInboundService> {
-	@Autowired
-	private ICuttingInboundService cuttingInboundService;
+    @Autowired
+    private ICuttingInboundService cuttingInboundService;
 
-	 @Autowired
-	 private ICuttingInboundDetailService cuttingInboundDetailService;
-	
-	/**
-	 * 鍒嗛〉鍒楄〃鏌ヨ
-	 *
-	 * @param cuttingInbound
-	 * @param pageNo
-	 * @param pageSize
-	 * @param req
-	 * @return
-	 */
-	//@AutoLog(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
-	@ApiOperation(value="鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ", notes="鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
-	@GetMapping(value = "/list")
-	public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
-								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-								   HttpServletRequest req) {
-		QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
-		Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
-		IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
-		return Result.OK(pageList);
-	}
-	
-	/**
-	 *   娣诲姞
-	 *
-	 * @param jSONObject
-	 * @return
-	 */
-	@AutoLog(value = "鍒�鍏峰叆搴撳崟-娣诲姞")
-	@ApiOperation(value="鍒�鍏峰叆搴撳崟-娣诲姞", notes="鍒�鍏峰叆搴撳崟-娣诲姞")
-	//@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
-	@PostMapping(value = "/add")
-	public Result<String> add(@RequestBody JSONObject jSONObject) {
-		CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
-		cuttingInbound.setOrderStatus("1");
-		cuttingInboundService.saveOrUpdate(cuttingInbound);
-		//鍒犻櫎鍘熷叧鑱旀暟鎹�
-		List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId,cuttingInbound.getId()).list();
-		cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
-		//娣诲姞鏂板叧鑱旀暟鎹�
-		JSONArray jsonArray = jSONObject.getJSONArray("detailData");
-		List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
-		for (int i = 0; i < list.size(); i++) {
-			CuttingInboundDetail temp = list.get(i);
-			temp.setOrderId(cuttingInbound.getId());
-			cuttingInboundDetailService.save(temp);
-		}
-		return Result.OK("鍏ュ簱鎴愬姛锛�");
-	}
-	
-	/**
-	 *  缂栬緫
-	 *
-	 * @param cuttingInbound
-	 * @return
-	 */
-	@AutoLog(value = "鍒�鍏峰叆搴撳崟-缂栬緫")
-	@ApiOperation(value="鍒�鍏峰叆搴撳崟-缂栬緫", notes="鍒�鍏峰叆搴撳崟-缂栬緫")
-	//@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
-	@RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
-	public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
-		cuttingInboundService.updateById(cuttingInbound);
-		return Result.OK("缂栬緫鎴愬姛!");
-	}
-	
-	/**
-	 *   閫氳繃id鍒犻櫎
-	 *
-	 * @param id
-	 * @return
-	 */
-	@AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
-	@ApiOperation(value="鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎", notes="鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
-	//@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
-	@DeleteMapping(value = "/delete")
-	public Result<String> delete(@RequestParam(name="id",required=true) String id) {
-		cuttingInboundService.removeById(id);
-		return Result.OK("鍒犻櫎鎴愬姛!");
-	}
-	
-	/**
-	 *  鎵归噺鍒犻櫎
-	 *
-	 * @param ids
-	 * @return
-	 */
-	@AutoLog(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
-	@ApiOperation(value="鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎", notes="鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
-	//@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
-	@DeleteMapping(value = "/deleteBatch")
-	public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
-		this.cuttingInboundService.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<CuttingInbound> queryById(@RequestParam(name="id",required=true) String id) {
-		CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
-		if(cuttingInbound==null) {
-			return Result.error("鏈壘鍒板搴旀暟鎹�");
-		}
-		return Result.OK(cuttingInbound);
-	}
+    @Autowired
+    private ICuttingInboundDetailService cuttingInboundDetailService;
+
+    @Autowired
+    private CuttingInboundMapper cuttingInboundMapper;
 
     /**
-    * 瀵煎嚭excel
-    *
-    * @param request
-    * @param cuttingInbound
-    */
-    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
-    @RequestMapping(value = "/exportXls")
-    public ModelAndView exportXls(HttpServletRequest request, CuttingInbound cuttingInbound) {
-        return super.exportXls(request, cuttingInbound, CuttingInbound.class, "鍒�鍏峰叆搴撳崟");
+     * 鍒嗛〉鍒楄〃鏌ヨ
+     *
+     * @param cuttingInbound
+     * @param pageNo
+     * @param pageSize
+     * @param req
+     * @return
+     */
+    //@AutoLog(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
+    @ApiOperation(value = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ", notes = "鍒�鍏峰叆搴撳崟-鍒嗛〉鍒楄〃鏌ヨ")
+    @GetMapping(value = "/list")
+    public Result<IPage<CuttingInbound>> queryPageList(CuttingInbound cuttingInbound,
+                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                       HttpServletRequest req) {
+        QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, req.getParameterMap());
+        Page<CuttingInbound> page = new Page<CuttingInbound>(pageNo, pageSize);
+        IPage<CuttingInbound> pageList = cuttingInboundService.page(page, queryWrapper);
+        return Result.OK(pageList);
     }
 
     /**
-      * 閫氳繃excel瀵煎叆鏁版嵁
-    *
-    * @param request
-    * @param response
-    * @return
-    */
+     * 娣诲姞
+     *
+     * @param jSONObject
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏峰叆搴撳崟-娣诲姞")
+    @ApiOperation(value = "鍒�鍏峰叆搴撳崟-娣诲姞", notes = "鍒�鍏峰叆搴撳崟-娣诲姞")
+    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:add")
+    @PostMapping(value = "/add")
+    public Result<String> add(@RequestBody JSONObject jSONObject) {
+        CuttingInbound cuttingInbound = jSONObject.toJavaObject(CuttingInbound.class);
+        cuttingInbound.setOrderStatus("1");
+        cuttingInboundService.saveOrUpdate(cuttingInbound);
+        //鍒犻櫎鍘熷叧鑱旀暟鎹�
+        List<CuttingInboundDetail> cuttingInboundDetailList = cuttingInboundDetailService.lambdaQuery().eq(CuttingInboundDetail::getOrderId, cuttingInbound.getId()).list();
+        cuttingInboundDetailService.removeBatchByIds(cuttingInboundDetailList);
+        //娣诲姞鏂板叧鑱旀暟鎹�
+        JSONArray jsonArray = jSONObject.getJSONArray("detailData");
+        List<CuttingInboundDetail> list = jsonArray.toJavaList(CuttingInboundDetail.class);
+        for (int i = 0; i < list.size(); i++) {
+            CuttingInboundDetail temp = list.get(i);
+            temp.setOrderId(cuttingInbound.getId());
+            cuttingInboundDetailService.save(temp);
+        }
+        return Result.OK("鍏ュ簱鎴愬姛锛�");
+    }
+
+    /**
+     * 缂栬緫
+     *
+     * @param cuttingInbound
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏峰叆搴撳崟-缂栬緫")
+    @ApiOperation(value = "鍒�鍏峰叆搴撳崟-缂栬緫", notes = "鍒�鍏峰叆搴撳崟-缂栬緫")
+    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:edit")
+    @RequestMapping(value = "/edit", method = {RequestMethod.PUT, RequestMethod.POST})
+    public Result<String> edit(@RequestBody CuttingInbound cuttingInbound) {
+        cuttingInboundService.updateById(cuttingInbound);
+        return Result.OK("缂栬緫鎴愬姛!");
+    }
+
+    /**
+     * 閫氳繃id鍒犻櫎
+     *
+     * @param id
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
+    @ApiOperation(value = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎", notes = "鍒�鍏峰叆搴撳崟-閫氳繃id鍒犻櫎")
+    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:delete")
+    @DeleteMapping(value = "/delete")
+    public Result<String> delete(@RequestParam(name = "id", required = true) String id) {
+        cuttingInboundService.removeById(id);
+        return Result.OK("鍒犻櫎鎴愬姛!");
+    }
+
+    /**
+     * 鎵归噺鍒犻櫎
+     *
+     * @param ids
+     * @return
+     */
+    @AutoLog(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
+    @ApiOperation(value = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎", notes = "鍒�鍏峰叆搴撳崟-鎵归噺鍒犻櫎")
+    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:deleteBatch")
+    @DeleteMapping(value = "/deleteBatch")
+    public Result<String> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
+        this.cuttingInboundService.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<CuttingInbound> queryById(@RequestParam(name = "id", required = true) String id) {
+        CuttingInbound cuttingInbound = cuttingInboundService.getById(id);
+        if (cuttingInbound == null) {
+            return Result.error("鏈壘鍒板搴旀暟鎹�");
+        }
+        return Result.OK(cuttingInbound);
+    }
+
+    /**
+     * 瀵煎嚭excel
+     *
+     * @param request
+     * @param cuttingInbound
+     */
+    //@RequiresPermissions("org.jeecg.modules:cms_cutting_inbound:exportXls")
+    @RequestMapping(value = "/exportXls")
+    public ModelAndView exportXls(CuttingInbound cuttingInbound, HttpServletRequest request) {
+//        return super.exportXls(request, cuttingInbound, CuttingInbound.class, "鍒�鍏峰叆搴撳崟");
+        // 鑾峰彇鏌ヨ鏉′欢
+        QueryWrapper<CuttingInbound> queryWrapper = QueryGenerator.initQueryWrapper(cuttingInbound, request.getParameterMap());
+
+        // 鏌ヨ涓昏〃鏁版嵁
+        List<CuttingInbound> pageList = cuttingInboundService.list(queryWrapper);
+
+        // 涓烘瘡涓富琛ㄦ暟鎹缃槑缁嗘暟鎹�
+        List<CuttingInboundExportVo> exportList = new ArrayList<>();
+        for (CuttingInbound item : pageList) {
+            CuttingInboundExportVo exportVo = new CuttingInboundExportVo();
+            // 澶嶅埗涓昏〃瀛楁
+            exportVo.setId(item.getId());
+            exportVo.setReceiver(item.getReceiver());
+            exportVo.setReceiveTime(item.getReceiveTime());
+            exportVo.setReceiveComment(item.getReceiveComment());
+            exportVo.setConfirmer(item.getConfirmer());
+            exportVo.setConfirmTime(item.getConfirmTime());
+            exportVo.setConfirmComment(item.getConfirmComment());
+            exportVo.setOrderStatus(item.getOrderStatus());
+
+            // 鏌ヨ骞惰缃槑缁嗘暟鎹�
+            List<CuttingInboundDetail> details = cuttingInboundDetailService.lambdaQuery()
+                    .eq(CuttingInboundDetail::getOrderId, item.getId())
+                    .list();
+            exportVo.setDetailList(details);
+
+            exportList.add(exportVo);
+        }
+
+        // 璁剧疆瀵煎嚭鍙傛暟
+        ExportParams params = new ExportParams("鍒�鍏峰叆搴撳崟", "瀵煎嚭鏁版嵁");
+
+        // 杩斿洖Excel瑙嗗浘
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.PARAMS, params);
+        mv.addObject(NormalExcelConstants.DATA_LIST, exportList);
+        mv.addObject(NormalExcelConstants.CLASS, CuttingInboundExportVo.class);
+
+        return mv;
+    }
+
+    /**
+     * 閫氳繃excel瀵煎叆鏁版嵁
+     *
+     * @param request
+     * @param response
+     * @return
+     */
     //@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("瀵煎叆澶辫触");
     }
 
-	 /**
-	  * 鏍规嵁鍏ュ簱id鏌ヨ鍏ュ簱鏄庣粏
-	  *
-	  * @param orderId
-	  * @return
-	  */
-	 @GetMapping("/detailList")
-	 public Result<?> detailList(@RequestParam("orderId") String orderId) {
-		 List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
-		 return Result.ok(list);
-	 }
+
+    /**
+     * 鏍规嵁鍏ュ簱id鏌ヨ鍏ュ簱鏄庣粏
+     *
+     * @param orderId
+     * @return
+     */
+    @GetMapping("/detailList")
+    public Result<?> detailList(@RequestParam("orderId") String orderId) {
+        List<Map<String, Object>> list = cuttingInboundDetailService.detailList(orderId);
+        return Result.ok(list);
+    }
 
 }
diff --git a/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java b/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
index fd987e0..76e228b 100644
--- a/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
+++ b/src/main/java/org/jeecg/modules/cms/entity/CuttingInboundDetail.java
@@ -48,7 +48,7 @@
     @ApiModelProperty(value = "鍏ュ簱鍗�")
     private String orderId;
 	/**鍒�鍏稩D*/
-	@Excel(name = "鍒�鍏稩D", width = 15)
+	@Excel(name = "鍒�鍏稩D", width = 15,dictTable = "cms_cutting_tool",dicCode = "id",dicText = "cutting_code")
     @ApiModelProperty(value = "鍒�鍏稩D")
     private String cuttingId;
 	/**鍏ュ簱鏁伴噺*/
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/CuttingInboundMapper.java b/src/main/java/org/jeecg/modules/cms/mapper/CuttingInboundMapper.java
index 5090cd9..e0afd0b 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/CuttingInboundMapper.java
+++ b/src/main/java/org/jeecg/modules/cms/mapper/CuttingInboundMapper.java
@@ -2,9 +2,12 @@
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import org.apache.ibatis.annotations.Param;
 import org.jeecg.modules.cms.entity.CuttingInbound;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.jeecg.modules.cms.vo.CuttingInboundExportVo;
 
 /**
  * @Description: 鍒�鍏峰叆搴撳崟
@@ -14,4 +17,6 @@
  */
 public interface CuttingInboundMapper extends BaseMapper<CuttingInbound> {
 
+    List<CuttingInboundExportVo> exportList(@Param(Constants.WRAPPER) QueryWrapper<CuttingInboundExportVo> queryWrapper);
+
 }
diff --git a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
index 9745da6..8a3b768 100644
--- a/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
+++ b/src/main/java/org/jeecg/modules/cms/mapper/xml/CuttingInboundMapper.xml
@@ -2,4 +2,22 @@
 <!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.CuttingInboundMapper">
 
+    <select id="exportList" resultType="org.jeecg.modules.cms.vo.CuttingInboundExportVo">
+        SELECT
+            t1.id,
+            t1.order_status AS oderStatus,
+            t1.receiver AS  receiver,
+            t1.receive_time AS  receiveTime,
+            t1.receive_comment AS  receiveComment,
+            t1.confirmer AS  confirmer,
+            t1.confirm_time AS  confirmTime,
+            t1.confirm_comment AS confirmComment,
+            t2.order_id AS orderId,
+            t2.cutting_id AS cuttingId,
+            t2.receive_number AS receiveNumber
+        FROM
+            cms_cutting_inbound t1
+                LEFT JOIN
+            cms_cutting_inbound_detail t2 on t1.id=t2.order_id
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java b/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java
new file mode 100644
index 0000000..6bbbf44
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/cms/vo/CuttingInboundExportVo.java
@@ -0,0 +1,117 @@
+package org.jeecg.modules.cms.vo;
+
+import org.jeecg.modules.cms.entity.CuttingInboundDetail;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.jeecgframework.poi.excel.annotation.ExcelCollection;
+import java.util.List;
+
+public class CuttingInboundExportVo {
+    /** 涓婚敭 */
+    @Excel(name = "鍏ュ簱鍗�", width = 15)
+    private String id;
+
+    /** 鍏ュ簱浜� */
+    @Excel(name = "鍏ュ簱浜�", width = 15,dictTable = "sys_user",dicCode = "id",dicText = "realname")
+    private String receiver;
+
+    /** 鍏ュ簱鏃堕棿 */
+    @Excel(name = "鍏ュ簱鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date receiveTime;
+
+    /** 鍏ュ簱璇存槑 */
+    @Excel(name = "鍏ュ簱璇存槑", width = 15)
+    private String receiveComment;
+
+    /** 纭浜� */
+    @Excel(name = "纭浜�", width = 15,dictTable = "sys_user",dicCode = "id",dicText = "realname")
+    private String confirmer;
+
+    /** 纭鏃堕棿 */
+    @Excel(name = "纭鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+    private java.util.Date confirmTime;
+
+    /** 纭鎰忚 */
+    @Excel(name = "纭鎰忚", width = 15)
+    private String confirmComment;
+
+    /** 璁㈠崟鐘舵�� */
+    @Excel(name = "璁㈠崟鐘舵��", width = 15)
+    private String orderStatus;
+
+    // 鏄庣粏闆嗗悎
+    @ExcelCollection(name = "鍏ュ簱鏄庣粏")
+    private List<CuttingInboundDetail> detailList;
+
+    // getter鍜宻etter鏂规硶...
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getReceiver() {
+        return receiver;
+    }
+
+    public void setReceiver(String receiver) {
+        this.receiver = receiver;
+    }
+
+    public java.util.Date getReceiveTime() {
+        return receiveTime;
+    }
+
+    public void setReceiveTime(java.util.Date receiveTime) {
+        this.receiveTime = receiveTime;
+    }
+
+    public String getReceiveComment() {
+        return receiveComment;
+    }
+
+    public void setReceiveComment(String receiveComment) {
+        this.receiveComment = receiveComment;
+    }
+
+    public String getConfirmer() {
+        return confirmer;
+    }
+
+    public void setConfirmer(String confirmer) {
+        this.confirmer = confirmer;
+    }
+
+    public java.util.Date getConfirmTime() {
+        return confirmTime;
+    }
+
+    public void setConfirmTime(java.util.Date confirmTime) {
+        this.confirmTime = confirmTime;
+    }
+
+    public String getConfirmComment() {
+        return confirmComment;
+    }
+
+    public void setConfirmComment(String confirmComment) {
+        this.confirmComment = confirmComment;
+    }
+
+    public String getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(String orderStatus) {
+        this.orderStatus = orderStatus;
+    }
+
+    public List<CuttingInboundDetail> getDetailList() {
+        return detailList;
+    }
+
+    public void setDetailList(List<CuttingInboundDetail> detailList) {
+        this.detailList = detailList;
+    }
+}
diff --git a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
index e9b0225..c4cb1ad 100644
--- a/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
+++ b/src/main/java/org/jeecg/modules/mes/controller/MesWorkReportingController.java
@@ -67,9 +67,9 @@
    @ApiOperation(value="宸ュ崟鎶ュ伐-鏂板鎶ュ伐", notes="宸ュ崟鎶ュ伐-鏂板鎶ュ伐")
    //@RequiresPermissions("org.jeecg.modules:mes_work_reporting:add")
    @PostMapping(value = "/add")
-   public Result<String> add(@RequestBody MesWorkReporting mesWorkReporting) {
-       mesWorkReportingService.addReporting(mesWorkReporting);
-       return Result.OK("娣诲姞鎴愬姛锛�");
+   public Result<MesWorkReporting> add(@RequestBody MesWorkReporting mesWorkReporting) {
+       MesWorkReporting workReporting = mesWorkReportingService.addReporting(mesWorkReporting);
+       return Result.OK("娣诲姞鎴愬姛锛�", workReporting);
    }
 
    /**
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
index a153d3a..48ca5e5 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesProductionWorkOrder.java
@@ -115,7 +115,7 @@
 	/**瀹為檯鎶ュ伐鏁伴噺*/
 	@Excel(name = "瀹為檯鎶ュ伐鏁伴噺", width = 15)
     @ApiModelProperty(value = "瀹為檯鎶ュ伐鏁伴噺")
-    private BigDecimal actualQuantity;
+    private BigDecimal actualQuantity = BigDecimal.ZERO;
     /**宸茬敓浜ф墭鏁帮紙褰撳墠鐝宸茬敓浜х殑鎵樻暟閲忥紝姣忔鎶ュ伐鏃舵洿鏂帮級*/
     @Excel(name = "宸茬敓浜ф墭鏁�", width = 15)
     @ApiModelProperty(value = "宸茬敓浜ф墭鏁�")
diff --git a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
index d281e7e..60d4545 100644
--- a/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
+++ b/src/main/java/org/jeecg/modules/mes/entity/MesWorkReporting.java
@@ -114,5 +114,11 @@
     @TableField(exist = false)
     @ApiModelProperty(value = "浠撳簱鍚嶇О")
     private String warehouseName;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "浠撳簱缂栫爜")
+    private String warehouseCode;
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鎶ュ伐绫诲瀷(鎴愬搧FINISHED銆佸崐鎴愬搧HALF)")
+    private String reportType;
 
 }
diff --git a/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java b/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
index 08505bf..1ac5542 100644
--- a/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
+++ b/src/main/java/org/jeecg/modules/mes/service/IMesWorkReportingService.java
@@ -15,5 +15,5 @@
     List<MesWorkReporting> queryWorkReportingByWorkOrderId(String workOrderId);
     List<MesWorkReporting> queryWorkReportingByOrderId(String orderId);
 
-    void addReporting(MesWorkReporting mesWorkReporting);
+    MesWorkReporting addReporting(MesWorkReporting mesWorkReporting);
 }
diff --git a/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java b/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
index 271c5aa..d5f8a99 100644
--- a/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
+++ b/src/main/java/org/jeecg/modules/mes/service/impl/MesWorkReportingServiceImpl.java
@@ -34,6 +34,11 @@
 import org.jeecg.modules.pms.service.IPmsMaterialProcessService;
 import org.jeecg.modules.pms.service.IPmsProcessBillMaterialsService;
 import org.jeecg.modules.pms.vo.ProcessBillMaterialsDetailVo;
+import org.jeecg.modules.qms.entity.InspectionPlan;
+import org.jeecg.modules.qms.entity.InspectionPlanItem;
+import org.jeecg.modules.qms.enums.PlanCategoryEnum;
+import org.jeecg.modules.qms.service.IInspectionPlanItemService;
+import org.jeecg.modules.qms.service.IInspectionPlanService;
 import org.jeecg.modules.sap.request.OrderLoadRequest;
 import org.jeecg.modules.sap.request.OrderReportRequest;
 import org.jeecg.modules.sap.service.OrderLoadService;
@@ -88,6 +93,10 @@
     private OrderReportService orderReportService;
     @Autowired
     private OrderLoadService orderLoadService;
+    @Autowired
+    private IInspectionPlanService inspectionPlanService;
+    @Autowired
+    private IInspectionPlanItemService inspectionPlanItemService;
 
     @Override
     public List<MesWorkReporting> queryWorkReportingByWorkOrderId(String workOrderId) {
@@ -101,7 +110,7 @@
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void addReporting(MesWorkReporting mesWorkReporting) {
+    public MesWorkReporting addReporting(MesWorkReporting mesWorkReporting) {
         MesProductionWorkOrder workOrder = mesProductionWorkOrderService.getById(mesWorkReporting.getWorkOrderId());
         if (workOrder == null) {
             throw new JeecgBootException("宸ュ崟涓嶅瓨鍦紒");
@@ -134,7 +143,9 @@
         int currentPallets = workOrder.getFinishedPallets() + 1;
         String batchNumber = yearLastTwo + dayOfYearStr + shiftGroup.getGroupCode() + currentPallets;
         mesWorkReporting.setBatchNumber(batchNumber)
+                .setWorkOrderCode(workOrder.getWorkOrderCode())
                 .setWarehouseId(lineSideWarehouse.getId())
+                .setWarehouseCode(lineSideWarehouse.getWarehouseCode())
                 .setReporter(Objects.requireNonNull(CommonUtils.getCurrentUser()).getUsername())
                 .setReportTime(new Date());
         String date = today.format(DateTimeFormatter.ofPattern("yyMMdd"));
@@ -144,11 +155,12 @@
             case FINISHED_PRODUCT:
                 //鎴愬搧鎶ュ伐
                 productReport(mesWorkReporting, workOrder, lineSideWarehouse);
+                //鐢熸垚妫�楠屽伐鍗�
+                generateInspectionOrder(mesWorkReporting, workOrder);
                 //鎷兼帴鎴愬搧鎶ュ伐鎵樺彿
                 String palletNumber4 = sysBusinessCodeRuleService.generateBusinessCodeSeq("WorkReportingPalletNumber4");
                 String finishedPalletNumber = material.getMaterialNumber() + date + palletNumber4;
-                mesWorkReporting.setPalletNumber(finishedPalletNumber);
-                //todo 鎵撳嵃鎴愬搧鎵樻爣绛俱�佹楠屾爣璇嗗崱銆佺Щ搴撳崟銆佸畬宸ユ楠屽伐鍗�
+                mesWorkReporting.setPalletNumber(finishedPalletNumber).setReportType("FINISHED");
                 break;
             case INNER_FLANGE:
             case OUTER_FLANGE:
@@ -158,7 +170,7 @@
                 Shift shift = shiftService.getById(workOrder.getShiftId());
                 String palletNumber6 = sysBusinessCodeRuleService.generateBusinessCodeSeq("WorkReportingPalletNumber6");
                 String halfPalletNumber = factory.getFactoryCode() + material.getMaterialNumber() + date + shift.getShiftCode() + palletNumber6;
-                mesWorkReporting.setPalletNumber(halfPalletNumber);
+                mesWorkReporting.setPalletNumber(halfPalletNumber).setReportType("HALF");
                 break;
         }
         //鏂板鎶ュ伐璁板綍
@@ -169,6 +181,8 @@
                 .setActualQuantity(workOrder.getActualQuantity().add(mesWorkReporting.getQuantity()))
                 .setFinishedPallets(workOrder.getFinishedPallets() + 1);
         mesProductionWorkOrderService.updateById(productionWorkUpdateOrder);
+        //杩斿洖鎶ュ伐璁板綍锛岀敤浜庢墭鏍囩鎵撳嵃
+        return mesWorkReporting;
     }
 
     //鍗婃垚鍝�(鍐呮硶鍏般�佸娉曞叞)銆佹垚鍝佹姤宸�
@@ -246,6 +260,27 @@
         }
     }
 
+    //鏍规嵁妫�楠屾柟妗堢敓鎴愭楠屽伐鍗�
+    private void generateInspectionOrder(MesWorkReporting mesWorkReporting, MesProductionWorkOrder workOrder) {
+        //1.鏍规嵁鐗╂枡缂栫爜鏌ヨ妫�楠屾柟妗�
+        InspectionPlan inspectionPlan = inspectionPlanService.list(new LambdaQueryWrapper<InspectionPlan>()
+                .eq(InspectionPlan::getMaterialNumber, workOrder.getMaterialNumber())
+                .eq(InspectionPlan::getPlanCategory, PlanCategoryEnum.COMPLETION_INSPECTION.name())
+                .eq(InspectionPlan::getPlanStatus, CommonConstant.STATUS_1)
+                .eq(InspectionPlan::getDelFlag, CommonConstant.DEL_FLAG_0)).stream().findFirst().orElse(null);
+        if (inspectionPlan == null) {
+            throw new JeecgBootException("鏈壘鍒拌鐗╂枡鐨勬楠屾柟妗堬紒");
+        }
+        List<InspectionPlanItem> inspectionPlanItemList = inspectionPlanItemService.list(new LambdaQueryWrapper<InspectionPlanItem>()
+                .eq(InspectionPlanItem::getPlanId, inspectionPlan.getId())
+                .orderByAsc(InspectionPlanItem::getSorter));
+        if (inspectionPlanItemList.isEmpty()) {
+            throw new JeecgBootException("鏈壘鍒拌鐗╂枡鐨勬楠屾柟妗堟楠岄」鏄庣粏锛�");
+        }
+        //2.鐢熸垚妫�楠屽伐鍗�
+        //todo 妫�楠屽伐鍗曠洰鍓嶈繕娌℃湁鐢熸垚浠ｇ爜锛屾病鏈夊姛鑳�
+    }
+
     private List<MesMaterialLoading> deductQuantity(List<MesMaterialLoading> materialLoadingRecordList, BigDecimal quantity) {
         for (MesMaterialLoading mesMaterialLoading : materialLoadingRecordList) {
             if (mesMaterialLoading.getRemainingQuantity().compareTo(quantity) >= 0) {
diff --git a/src/main/java/org/jeecg/modules/qms/enums/PlanCategoryEnum.java b/src/main/java/org/jeecg/modules/qms/enums/PlanCategoryEnum.java
new file mode 100644
index 0000000..5a8024d
--- /dev/null
+++ b/src/main/java/org/jeecg/modules/qms/enums/PlanCategoryEnum.java
@@ -0,0 +1,16 @@
+package org.jeecg.modules.qms.enums;
+
+public enum PlanCategoryEnum {
+    FIRST_INSPECTION, //棣栨
+    ROUTING_INSPECTION, //宸℃
+    COMPLETION_INSPECTION; //瀹屽伐妫�
+
+    public static PlanCategoryEnum fromName(String name) {
+        for (PlanCategoryEnum category : PlanCategoryEnum.values()) {
+            if (category.name().equals(name)) {
+                return category;
+            }
+        }
+        return null;
+    }
+}

--
Gitblit v1.9.3