From 6068faa866f976b7848b872420f2d93f77f5035b Mon Sep 17 00:00:00 2001 From: hdy <1105738590@qq.com> Date: 星期日, 12 五月 2024 18:15:38 +0800 Subject: [PATCH] 打印 --- jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 82 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 82 insertions(+), 0 deletions(-) diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java index fb467e3..75e574a 100644 --- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java +++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java @@ -1,11 +1,22 @@ package com.jcdm.main.om.productionOrde.controller; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import javax.servlet.http.HttpServletResponse; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.jcdm.common.core.domain.entity.SysUser; +import com.jcdm.common.core.domain.model.LoginUser; +import com.jcdm.common.utils.ServletUtils; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; +import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfoExcelImport; +import com.jcdm.main.om.productionOrde.mapper.OmProductionOrdeInfoMapper; import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService; +import com.jcdm.main.restful.factoryMes.service.RestfulService; +import org.aspectj.weaver.loadtime.Aj; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -22,6 +33,7 @@ import com.jcdm.common.enums.BusinessType; import com.jcdm.common.utils.poi.ExcelUtil; import com.jcdm.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; /** * 鐢熶骇宸ュ崟Controller @@ -60,6 +72,38 @@ List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.selectOmProductionOrdeInfoList(omProductionOrdeInfo); ExcelUtil<OmProductionOrdeInfo> util = new ExcelUtil<OmProductionOrdeInfo>(OmProductionOrdeInfo.class); util.exportExcel(response, list, "鐢熶骇宸ュ崟鏁版嵁"); + } + + @GetMapping("/receivingWorkOrders") + public AjaxResult receivingWorkOrders() + { + String paramProductNum = ""; + // 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅 + List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().orderByAsc(OmProductionOrdeInfo::getCreateTime)); + if(list.size() > 0){ + paramProductNum = list.get(list.size()-1).getProductNum(); + } + String orderJsonString = RestfulService.getProductionWorkOrderRequest(paramProductNum, "POP230"); + JSONObject jsonObject = new JSONObject(orderJsonString); + // 浠嶫SONObject涓幏鍙杁ata瀵硅薄 + JSONObject dataObject = jsonObject.getJSONObject("data"); + String code = jsonObject.getStr("code"); + // 鍒ゆ柇鎺ュ崟鏄惁鎴愬姛 + if(code.equals("success")){ + OmProductionOrdeInfo omProductionOrdeInfo = new OmProductionOrdeInfo(); + omProductionOrdeInfo.setWorkOrderNo(dataObject.getStr("productionOrderNum")); + omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum")); + omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode")); + omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode")); + omProductionOrdeInfo.setCreateTime(new Date()); + omProductionOrdeInfo.setCreateUser("宸ュ巶MES"); + + omProductionOrdeInfoService.save(omProductionOrdeInfo); + }else { + return AjaxResult.error("鎺ュ崟澶辫触,璇疯仈绯荤鐞嗗憳"); + } + + return AjaxResult.success(dataObject.getStr("productNum")); } /** @@ -114,4 +158,42 @@ { return omProductionOrdeInfoService.upDownMove(omProductionOrdeInfo); } + + @PostMapping("/importData") + public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception + { + ExcelUtil<OmProductionOrdeInfo> util = new ExcelUtil<OmProductionOrdeInfo>(OmProductionOrdeInfo.class); + List<OmProductionOrdeInfo> ordeInfo = util.importExcel(file.getInputStream()); + for (OmProductionOrdeInfo omProductionOrdeInfo : ordeInfo) { + omProductionOrdeInfo.setCreateTime(new Date()); + omProductionOrdeInfo.setCreateBy("宸ュ巶MES"); + } + omProductionOrdeInfoService.overrideSaveBatch(ordeInfo); + return AjaxResult.success(); + } + + @PostMapping("/importTemplate") + public void importTemplate(HttpServletResponse response) + { + ExcelUtil<OmProductionOrdeInfoExcelImport> util = new ExcelUtil<OmProductionOrdeInfoExcelImport>(OmProductionOrdeInfoExcelImport.class); + util.importTemplateExcel(response, "璁㈠崟鏁版嵁"); + } + + @PostMapping("/trolleyYardBinDing") + public AjaxResult trolleyYardBinDing(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo) + { + return omProductionOrdeInfoService.trolleyYardBinDing(omProductionOrdeInfo); + } + + @PostMapping("/getCarCodeSize") + public AjaxResult getCarCodeSize(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo) + { + return omProductionOrdeInfoService.getCarCodeSize(omProductionOrdeInfo); + } + + @PostMapping("/findBytrolleyYardGetOne") + public AjaxResult findBytrolleyYardGetOne(@RequestBody OmProductionOrdeInfo omProductionOrdeInfo) + { + return omProductionOrdeInfoService.findBytrolleyYardGetOne(omProductionOrdeInfo); + } } -- Gitblit v1.9.3