From d22518b21cf2f312d2e315b60abec92625d089f4 Mon Sep 17 00:00:00 2001
From: "JinLu.Yin" <411641505@qq.com>
Date: Fri, 2 Sep 2022 14:04:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=96=99=E5=8D=95=E5=A4=B4=E4=B8=8A?=
=?UTF-8?q?=E7=9A=84=E4=BB=93=E5=BA=93=E3=80=81=E5=BA=93=E5=8C=BA=E3=80=81?=
=?UTF-8?q?=E5=BA=93=E4=BD=8D=E5=90=8D=E7=A7=B0=E6=98=BE=E7=A4=BA=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=EF=BC=9B=E6=9D=A1=E7=A0=81=E5=8A=9F=E8=83=BD=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../controller/WmIssueHeaderController.java | 57 +++++++++++--
.../java/com/ktg/mes/wm/domain/WmBarcode.java | 82 +++++++++++++------
.../resources/mapper/wm/WmBarcodeMapper.xml | 27 ++++--
3 files changed, 129 insertions(+), 37 deletions(-)
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmIssueHeaderController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmIssueHeaderController.java
index 0959f10..0c6e66b 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmIssueHeaderController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmIssueHeaderController.java
@@ -5,11 +5,10 @@ import javax.servlet.http.HttpServletResponse;
import cn.hutool.core.collection.CollUtil;
import com.ktg.common.constant.UserConstants;
-import com.ktg.mes.wm.domain.WmIssueLine;
+import com.ktg.common.utils.StringUtils;
+import com.ktg.mes.wm.domain.*;
import com.ktg.mes.wm.domain.tx.IssueTxBean;
-import com.ktg.mes.wm.service.IStorageCoreService;
-import com.ktg.mes.wm.service.IWmIssueLineService;
-import com.ktg.mes.wm.service.IWmStorageAreaService;
+import com.ktg.mes.wm.service.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
@@ -25,8 +24,6 @@ import com.ktg.common.annotation.Log;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
import com.ktg.common.enums.BusinessType;
-import com.ktg.mes.wm.domain.WmIssueHeader;
-import com.ktg.mes.wm.service.IWmIssueHeaderService;
import com.ktg.common.utils.poi.ExcelUtil;
import com.ktg.common.core.page.TableDataInfo;
@@ -49,6 +46,15 @@ public class WmIssueHeaderController extends BaseController
@Autowired
private IStorageCoreService storageCoreService;
+ @Autowired
+ private IWmWarehouseService wmWarehouseService;
+
+ @Autowired
+ private IWmStorageLocationService wmStorageLocationService;
+
+ @Autowired
+ private IWmStorageAreaService wmStorageAreaService;
+
/**
* 查询生产领料单头列表
*/
@@ -95,6 +101,26 @@ public class WmIssueHeaderController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
return AjaxResult.error("领料单编号已存在");
}
+ //根据领料单头上的仓库、库区、库位ID设置对应的编号和名称
+ if(StringUtils.isNotNull(wmIssueHeader.getWarehouseId())){
+ WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmIssueHeader.getWarehouseId());
+ wmIssueHeader.setWarehouseCode(warehouse.getWarehouseCode());
+ wmIssueHeader.setWarehouseName(warehouse.getWarehouseName());
+ }
+
+ if(StringUtils.isNotNull(wmIssueHeader.getLocationId())){
+ WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmIssueHeader.getLocationId());
+ wmIssueHeader.setLocationCode(location.getLocationCode());
+ wmIssueHeader.setLocationName(location.getLocationName());
+ }
+
+ if(StringUtils.isNotNull(wmIssueHeader.getAreaId())){
+ WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmIssueHeader.getAreaId());
+ wmIssueHeader.setAreaCode(area.getAreaCode());
+ wmIssueHeader.setAreaName(area.getAreaName());
+ }
+
+
return toAjax(wmIssueHeaderService.insertWmIssueHeader(wmIssueHeader));
}
@@ -109,6 +135,25 @@ public class WmIssueHeaderController extends BaseController
if(UserConstants.NOT_UNIQUE.equals(wmIssueHeaderService.checkIssueCodeUnique(wmIssueHeader))){
return AjaxResult.error("领料单编号已存在");
}
+
+ //根据领料单头上的仓库、库区、库位ID设置对应的编号和名称
+ if(StringUtils.isNotNull(wmIssueHeader.getWarehouseId())){
+ WmWarehouse warehouse = wmWarehouseService.selectWmWarehouseByWarehouseId(wmIssueHeader.getWarehouseId());
+ wmIssueHeader.setWarehouseCode(warehouse.getWarehouseCode());
+ wmIssueHeader.setWarehouseName(warehouse.getWarehouseName());
+ }
+
+ if(StringUtils.isNotNull(wmIssueHeader.getLocationId())){
+ WmStorageLocation location = wmStorageLocationService.selectWmStorageLocationByLocationId(wmIssueHeader.getLocationId());
+ wmIssueHeader.setLocationCode(location.getLocationCode());
+ wmIssueHeader.setLocationName(location.getLocationName());
+ }
+
+ if(StringUtils.isNotNull(wmIssueHeader.getAreaId())){
+ WmStorageArea area = wmStorageAreaService.selectWmStorageAreaByAreaId(wmIssueHeader.getAreaId());
+ wmIssueHeader.setAreaCode(area.getAreaCode());
+ wmIssueHeader.setAreaName(area.getAreaName());
+ }
return toAjax(wmIssueHeaderService.updateWmIssueHeader(wmIssueHeader));
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmBarcode.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmBarcode.java
index 434f405..1e5ca95 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmBarcode.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmBarcode.java
@@ -30,9 +30,19 @@ public class WmBarcode extends BaseEntity
@Excel(name = "产品物料ID")
private String barcodeContent;
+ private Long bussinessId;
+
+ /** 业务编码 */
+ @Excel(name = "业务编码")
+ private String bussinessCode;
+
+ /** 业务名称 */
+ @Excel(name = "业务编码")
+ private String bussinessName;
+
/** 条码地址 */
@Excel(name = "条码地址")
- private String url;
+ private String barcodeUrl;
/** 是否生效 */
@Excel(name = "是否生效")
@@ -90,16 +100,40 @@ public class WmBarcode extends BaseEntity
{
return barcodeContent;
}
- public void setUrl(String url)
- {
- this.url = url;
+
+ public Long getBussinessId() {
+ return bussinessId;
}
- public String getUrl()
- {
- return url;
+ public void setBussinessId(Long bussinessId) {
+ this.bussinessId = bussinessId;
}
- public void setEnableFlag(String enableFlag)
+
+ public String getBussinessCode() {
+ return bussinessCode;
+ }
+
+ public void setBussinessCode(String bussinessCode) {
+ this.bussinessCode = bussinessCode;
+ }
+
+ public String getBussinessName() {
+ return bussinessName;
+ }
+
+ public void setBussinessName(String bussinessName) {
+ this.bussinessName = bussinessName;
+ }
+
+ public String getBarcodeUrl() {
+ return barcodeUrl;
+ }
+
+ public void setBarcodeUrl(String barcodeUrl) {
+ this.barcodeUrl = barcodeUrl;
+ }
+
+ public void setEnableFlag(String enableFlag)
{
this.enableFlag = enableFlag;
}
@@ -147,22 +181,20 @@ public class WmBarcode extends BaseEntity
@Override
public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("barcodeId", getBarcodeId())
- .append("barcodeFormart", getBarcodeFormart())
- .append("barcodeType", getBarcodeType())
- .append("barcodeContent", getBarcodeContent())
- .append("url", getUrl())
- .append("enableFlag", getEnableFlag())
- .append("remark", getRemark())
- .append("attr1", getAttr1())
- .append("attr2", getAttr2())
- .append("attr3", getAttr3())
- .append("attr4", getAttr4())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
+ return "WmBarcode{" +
+ "barcodeId=" + barcodeId +
+ ", barcodeFormart='" + barcodeFormart + '\'' +
+ ", barcodeType='" + barcodeType + '\'' +
+ ", barcodeContent='" + barcodeContent + '\'' +
+ ", bussinessId=" + bussinessId +
+ ", bussinessCode='" + bussinessCode + '\'' +
+ ", bussinessName='" + bussinessName + '\'' +
+ ", barcodeUrl='" + barcodeUrl + '\'' +
+ ", enableFlag='" + enableFlag + '\'' +
+ ", attr1='" + attr1 + '\'' +
+ ", attr2='" + attr2 + '\'' +
+ ", attr3=" + attr3 +
+ ", attr4=" + attr4 +
+ '}';
}
}
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmBarcodeMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmBarcodeMapper.xml
index e64c747..c126d22 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmBarcodeMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmBarcodeMapper.xml
@@ -9,7 +9,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-
+
+
+
+
@@ -23,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select barcode_id, barcode_formart, barcode_type, barcode_content, url, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_barcode
+ select barcode_id, barcode_formart, barcode_type, barcode_content,bussiness_id,bussiness_code,bussiness_name, barcode_url, enable_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_barcode