From 16714e1a824acd878b105e6ac433866cfc50ed89 Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期三, 05 六月 2024 16:44:47 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/controller/OmProductionOrdeInfoController.java | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 45 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 d000934..65b724a 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 @@ -11,6 +11,7 @@ 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.common.utils.StringUtils; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfo; import com.jcdm.main.om.productionOrde.domain.OmProductionOrdeInfoExcelImport; import com.jcdm.main.om.productionOrde.mapper.OmProductionOrdeInfoMapper; @@ -61,6 +62,37 @@ return getDataTable(list); } + @GetMapping("/checkCarCode") + public AjaxResult checkCarCode(OmProductionOrdeInfo omProductionOrdeInfo) + { + Integer i = 0; + List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum())); + if(StringUtils.isNotBlank(list.get(0).getTrolleyYard())){ + i = 1; + } + return AjaxResult.success(i); + } + + @GetMapping("/checkYzSfcCode") + public AjaxResult checkYzSfcCode(OmProductionOrdeInfo omProductionOrdeInfo) + { + Integer i = 0; + List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum())); + if(StringUtils.isNotBlank(list.get(0).getSpareField2())){ + i = 1; + } + return AjaxResult.success(i); + } + + @GetMapping("/bindYzSfcFlag") + public AjaxResult bindYzSfcFlag(OmProductionOrdeInfo omProductionOrdeInfo) + { + List<OmProductionOrdeInfo> list = omProductionOrdeInfoService.list(new LambdaQueryWrapper<OmProductionOrdeInfo>().eq(OmProductionOrdeInfo::getProductNum, omProductionOrdeInfo.getProductNum())); + list.get(0).setSpareField2("1"); + omProductionOrdeInfoService.saveOrUpdate(list.get(0)); + return AjaxResult.success(null); + } + /** * 瀵煎嚭鐢熶骇宸ュ崟鍒楄〃 */ @@ -95,6 +127,11 @@ omProductionOrdeInfo.setProductNum(dataObject.getStr("productNum")); omProductionOrdeInfo.setStationCode(dataObject.getStr("stationCode")); omProductionOrdeInfo.setMaterialCode(dataObject.getStr("materialCode")); + if(dataObject.getStr("model").equals("PE01A")){ + omProductionOrdeInfo.setProductCode("1P102S"); + }else { + omProductionOrdeInfo.setProductCode(dataObject.getStr("model")); + } omProductionOrdeInfo.setCreateTime(new Date()); omProductionOrdeInfo.setCreateUser("宸ュ巶MES"); @@ -106,6 +143,14 @@ return AjaxResult.success(dataObject.getStr("productNum")); } + @GetMapping(value = "/jieBang/{id}") + public AjaxResult jieBang(@PathVariable("id") Long id) + { + OmProductionOrdeInfo byId = omProductionOrdeInfoService.getById(id); + byId.setTrolleyYard(""); + return success(omProductionOrdeInfoService.saveOrUpdate(byId)); + } + /** * 鑾峰彇鐢熶骇宸ュ崟璇︾粏淇℃伅 */ -- Gitblit v1.9.3