From 16fa6007037e14f079370e85f3335f299d559ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?yinjinlu-pc=5C=E5=B0=B9=E9=87=91=E8=B7=AF?= <411641505@qq.com> Date: Fri, 6 Dec 2024 12:04:05 +0800 Subject: [PATCH] =?UTF-8?q?SN=E6=B5=81=E8=BD=AC=E8=AE=B0=E5=BD=95=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mobile/MdProductSIPMobController.java | 36 ++++++++++++++++++ .../controller/ProSnProcessController.java | 1 + .../mobile/ProCardProcessMobController.java | 2 +- .../ktg/mes/pro/domain/ProCardProcess.java | 8 ++-- .../mobile/WmBarcodeMobController.java | 37 +++++++++++++++++++ .../mapper/system/SysAutoCodeRuleMapper.xml | 2 + 6 files changed, 81 insertions(+), 5 deletions(-) create mode 100644 ktg-mes/src/main/java/com/ktg/mes/md/controller/mobile/MdProductSIPMobController.java create mode 100644 ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmBarcodeMobController.java diff --git a/ktg-mes/src/main/java/com/ktg/mes/md/controller/mobile/MdProductSIPMobController.java b/ktg-mes/src/main/java/com/ktg/mes/md/controller/mobile/MdProductSIPMobController.java new file mode 100644 index 0000000..628ee0f --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/md/controller/mobile/MdProductSIPMobController.java @@ -0,0 +1,36 @@ +package com.ktg.mes.md.controller.mobile; + +import com.ktg.common.core.controller.BaseController; +import com.ktg.common.core.page.TableDataInfo; +import com.ktg.mes.md.domain.MdProductSip; +import com.ktg.mes.md.service.IMdProductSipService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author yinjinlu + * @description + * @date 2024/12/5 + */ +@RestController +@RequestMapping("/mobile/md/sip") +public class MdProductSIPMobController extends BaseController { + + @Autowired + private IMdProductSipService mdProductSipService; + + /** + * 查询产品SIP列表 + */ + @GetMapping("/list") + public TableDataInfo list(MdProductSip mdProductSip) + { + startPage(); + List list = mdProductSipService.selectMdProductSipList(mdProductSip); + return getDataTable(list); + } +} diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProSnProcessController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProSnProcessController.java index 93cf0ce..380c2b7 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProSnProcessController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProSnProcessController.java @@ -77,6 +77,7 @@ public class ProSnProcessController extends BaseController @PostMapping public AjaxResult add(@RequestBody ProSnProcess proSnProcess) { + return toAjax(proSnProcessService.insertProSnProcess(proSnProcess)); } diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardProcessMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardProcessMobController.java index 570fb8f..49601fd 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardProcessMobController.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardProcessMobController.java @@ -146,7 +146,7 @@ public class ProCardProcessMobController extends BaseController { * @param cardProcess * @return */ - @ApiOperation("根据流转卡号查询所有的生产任务") + @ApiOperation("根据流转卡号和工作站查询所有的生产任务") @PreAuthorize("@ss.hasPermi('mes:pro:procard:list')") @GetMapping("/getCardProTask") public AjaxResult getCardProTask(ProCardProcess cardProcess){ diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCardProcess.java b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCardProcess.java index 9790fe9..df01a04 100644 --- a/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCardProcess.java +++ b/ktg-mes/src/main/java/com/ktg/mes/pro/domain/ProCardProcess.java @@ -46,13 +46,13 @@ public class ProCardProcess extends BaseEntity private String processName; /** 进入工序时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "进入工序时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "进入工序时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date inputTime; /** 出工序时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "出工序时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "出工序时间", width = 30, dateFormat = "yyyy-MM-dd hh:mm:ss") private Date outputTime; /** 投入数量 */ diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmBarcodeMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmBarcodeMobController.java new file mode 100644 index 0000000..0c4abcc --- /dev/null +++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmBarcodeMobController.java @@ -0,0 +1,37 @@ +package com.ktg.mes.wm.controller.mobile; + +import com.ktg.common.core.domain.AjaxResult; +import com.ktg.mes.wm.domain.WmBarcode; +import com.ktg.mes.wm.service.IWmBarcodeService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author yinjinlu + * @description + * @date 2024/12/5 + */ +@RestController +@RequestMapping("/mobile/wm/barcode") +public class WmBarcodeMobController { + @Autowired + private IWmBarcodeService wmBarcodeService; + + /** + * 获取某个对象的二维码地址 + * @return + */ + @GetMapping("/getBarcodeUrl") + public AjaxResult getBarcodeUrl(WmBarcode wmBarcode){ + List list = wmBarcodeService.selectWmBarcodeList(wmBarcode); + if(!CollectionUtils.isEmpty(list)){ + return AjaxResult.success(list.get(0)); + } + return AjaxResult.success(); + } +} diff --git a/ktg-system/src/main/resources/mapper/system/SysAutoCodeRuleMapper.xml b/ktg-system/src/main/resources/mapper/system/SysAutoCodeRuleMapper.xml index 7d6e8d6..52d4c0d 100644 --- a/ktg-system/src/main/resources/mapper/system/SysAutoCodeRuleMapper.xml +++ b/ktg-system/src/main/resources/mapper/system/SysAutoCodeRuleMapper.xml @@ -40,6 +40,7 @@ AND rule_name like concat('%', #{ruleName}, '%') + order by create_time desc