From 92e300607d3ccdfb92bc40400df7547cc301ae07 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: Sun, 24 Nov 2024 18:39:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E8=BD=AC=E5=8D=95=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ktg-admin/pom.xml | 12 ++++++++
.../ktg/common/constant/UserConstants.java | 1 +
.../mes/pro/controller/ProCardController.java | 9 ++++--
.../mobile/ProCardMobController.java | 8 +++++
.../ktg/mes/wm/controller/WmSnController.java | 4 +--
.../controller/mobile/WmSnMobController.java | 20 +++++++++++++
.../main/java/com/ktg/mes/wm/domain/WmSn.java | 29 +++++++++----------
.../resources/mapper/pro/ProCardMapper.xml | 4 +--
.../main/resources/mapper/wm/WmSnMapper.xml | 16 +++++-----
9 files changed, 74 insertions(+), 29 deletions(-)
diff --git a/ktg-admin/pom.xml b/ktg-admin/pom.xml
index e108f1a..869cf31 100644
--- a/ktg-admin/pom.xml
+++ b/ktg-admin/pom.xml
@@ -67,6 +67,18 @@
ktg-mes
+
+
+ com.ktg
+ ktg-print
+
+
+
+
+ com.ktg
+ ktg-iot
+
+
diff --git a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
index a192e62..d3f13e8 100644
--- a/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
+++ b/ktg-common/src/main/java/com/ktg/common/constant/UserConstants.java
@@ -233,6 +233,7 @@ public class UserConstants
public static final String BARCODE_TYPE_WORKORDER = "WORKORDER";
public static final String BARCODE_TYPE_TOOL = "TOOL";
public static final String BARCODE_TYPE_SN = "SN";
+ public static final String BARCODE_TYPE_PROCARD ="PROCARD";
/**
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java
index e4ce632..54a2450 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/ProCardController.java
@@ -7,6 +7,7 @@ import com.ktg.common.constant.UserConstants;
import com.ktg.common.utils.StringUtils;
import com.ktg.mes.pro.domain.ProWorkorder;
import com.ktg.mes.pro.service.IProWorkorderService;
+import com.ktg.mes.wm.utils.WmBarCodeUtil;
import com.ktg.system.strategy.AutoCodeUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +41,9 @@ public class ProCardController extends BaseController
@Autowired
private IProCardService proCardService;
+ @Autowired
+ private WmBarCodeUtil wmBarCodeUtil;
+
/**
* 查询工序流转卡列表
*/
@@ -83,8 +87,9 @@ public class ProCardController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody ProCard proCard)
{
-
- return toAjax(proCardService.insertProCard(proCard));
+ int ret = proCardService.insertProCard(proCard);
+ wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_PROCARD,proCard.getCardId(),proCard.getCardCode(),"");
+ return toAjax(ret);
}
/**
diff --git a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardMobController.java b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardMobController.java
index 767cf30..f5d6de2 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/pro/controller/mobile/ProCardMobController.java
@@ -60,6 +60,14 @@ public class ProCardMobController extends BaseController {
@PreAuthorize("@ss.hasPermi('mes:pro:procard:list')")
@GetMapping("/getStationList")
public AjaxResult getStationList(ProCard card){
+ if(!StringUtils.isNotNull(card.getWorkorderId())){
+ return AjaxResult.error("请传递生产工单ID参数");
+ }
+
+ if(!StringUtils.isNotNull(card.getWorkstationId())){
+ return AjaxResult.error("请传递工作站ID参数");
+ }
+
List list = proCardService.getStationList(card);
return AjaxResult.success(list);
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java
index ac71660..229f596 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmSnController.java
@@ -94,11 +94,11 @@ public class WmSnController extends BaseController
@PreAuthorize("@ss.hasPermi('mes:pro:procard:list')")
@GetMapping("/getStationList")
public AjaxResult getStationList(WmSn sn){
- if(!StringUtils.isNotNull(sn.getWorkOrderId())){
+ if(!StringUtils.isNotNull(sn.getWorkorderId())){
return AjaxResult.error("请指定生产工单ID");
}
- if(StringUtils.isNotNull(sn.getWorkStationId())){
+ if(StringUtils.isNotNull(sn.getWorkstationId())){
return AjaxResult.error("请指定工作站!");
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java
index 816180b..44342a5 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/mobile/WmSnMobController.java
@@ -7,11 +7,13 @@ import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.core.page.TableDataInfo;
import com.ktg.common.enums.BusinessType;
+import com.ktg.common.utils.StringUtils;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.mes.wm.domain.WmSn;
import com.ktg.mes.wm.service.IWmSnService;
import com.ktg.system.strategy.AutoCodeUtil;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
@@ -53,6 +55,24 @@ public class WmSnMobController extends BaseController {
return getDataTable(list);
}
+ @ApiOperation("根据生产工单和工作站查询所有SN流转记录")
+ @GetMapping("/getStationList")
+ public AjaxResult getStationList(WmSn sn){
+ if(StringUtils.isNotNull(sn.getWorkorderId())){
+ return AjaxResult.error("请输入生产工单ID参数");
+ }
+
+ if(StringUtils.isNotNull(sn.getWorkstationId())){
+ return AjaxResult.error("请输入工作站ID参数");
+ }
+
+ List snList = wmSnService.getStationList(sn);
+ return AjaxResult.success(snList);
+ }
+
+
+
+
/**
* 导出SN码列表
*/
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
index 4bdb903..42fe8e4 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmSn.java
@@ -50,11 +50,11 @@ public class WmSn extends BaseEntity
private String batchCode;
- private Long workOrderId;
+ private Long workorderId;
private Date inputTime;
- private Long workStationId;
+ private Long workstationId;
/**
* SN码的数量
@@ -203,15 +203,6 @@ public class WmSn extends BaseEntity
return attr4;
}
-
- public Long getWorkOrderId() {
- return workOrderId;
- }
-
- public void setWorkOrderId(Long workOrderId) {
- this.workOrderId = workOrderId;
- }
-
public Date getInputTime() {
return inputTime;
}
@@ -220,12 +211,20 @@ public class WmSn extends BaseEntity
this.inputTime = inputTime;
}
- public Long getWorkStationId() {
- return workStationId;
+ public Long getWorkorderId() {
+ return workorderId;
}
- public void setWorkStationId(Long workStationId) {
- this.workStationId = workStationId;
+ public void setWorkorderId(Long workorderId) {
+ this.workorderId = workorderId;
+ }
+
+ public Long getWorkstationId() {
+ return workstationId;
+ }
+
+ public void setWorkstationId(Long workstationId) {
+ this.workstationId = workstationId;
}
@Override
diff --git a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
index 435dce4..70867a6 100644
--- a/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/pro/ProCardMapper.xml
@@ -69,8 +69,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from pro_card pc
left join pro_card_process pcp
on pc.card_id = pcp.card_id
- where pc.workorder_id = #{workOrderId}
- and pc.workstation_id = #{workStationId}
+ where pc.workorder_id = #{workorderId}
+ and pcp.workstation_id = #{workstationId}
order by pcp.input_time desc
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
index c18436c..7ac1276 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmSnMapper.xml
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, work_order_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
+ select sn_id, sn_code, item_id, item_code, item_name, specification, unit_of_measure, batch_code, workorder_id, gen_date, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_sn
@@ -72,8 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from wm_sn sn
left join pro_sn_process ps
on sn.sn_id = ps.sn_id
- where sn.work_order_id =#{workOrderId}
- and ps.workstation_id = #{workStationId}
+ where sn.workorder_id =#{workorderId}
+ and ps.workstation_id = #{workstationId}
order by ps.input_time desc
@@ -88,7 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
specification,
unit_of_measure,
batch_code,
- work_order_id,
+ workorder_id,
gen_date,
remark,
attr1,
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{specification},
#{unitOfMeasure},
#{batchCode},
- #{workOrderId},
+ #{workorderId},
#{genDate},
#{remark},
#{attr1},
@@ -132,7 +132,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
specification = #{specification},
unit_of_measure = #{unitOfMeasure},
batch_code = #{batchCode},
- work_order_id = #{workOrderId},
+ workorder_id = #{workorderId},
remark = #{remark},
attr1 = #{attr1},
attr2 = #{attr2},