From 4dd6e5be8a2a9251912eabc8fa90119f64e2a201 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: Thu, 6 Feb 2025 11:43:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E5=BA=93=E4=BD=8D=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E2=80=9C=E5=85=81=E8=AE=B8=E4=BA=A7=E5=93=81=E6=B7=B7=E6=94=BE?=
=?UTF-8?q?=E2=80=9D=E5=92=8C=E2=80=9C=E5=85=81=E8=AE=B8=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E6=B7=B7=E6=94=BE=E2=80=9D=E4=B8=A4=E4=B8=AA=E6=A0=87=E8=AF=86?=
=?UTF-8?q?=EF=BC=9B=E4=B8=BA=E5=BA=93=E5=8C=BA=E5=A2=9E=E5=8A=A0=E6=89=B9?=
=?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=89=80=E6=9C=89=E5=BA=93=E4=BD=8D?=
=?UTF-8?q?=E4=BA=A7=E5=93=81=E6=B7=B7=E6=94=BE=E5=92=8C=E6=89=B9=E6=AC=A1?=
=?UTF-8?q?=E6=B7=B7=E6=94=BE=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../WmStorageLocationController.java | 36 ++++++++++++++-----
.../com/ktg/mes/wm/domain/WmStorageArea.java | 26 ++++++++++++++
.../mes/wm/mapper/WmStorageAreaMapper.java | 10 ++++++
.../mes/wm/service/IWmStorageAreaService.java | 14 ++++++++
.../impl/WmStorageAreaServiceImpl.java | 16 +++++++++
.../mapper/wm/WmStorageAreaMapper.xml | 25 ++++++++++++-
6 files changed, 117 insertions(+), 10 deletions(-)
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java
index a43807b..068a693 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/controller/WmStorageLocationController.java
@@ -4,19 +4,13 @@ import java.util.List;
import javax.servlet.http.HttpServletResponse;
import com.ktg.common.constant.UserConstants;
+import com.ktg.mes.wm.domain.WmStorageArea;
import com.ktg.mes.wm.service.IWmStorageAreaService;
import com.ktg.mes.wm.utils.WmBarCodeUtil;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import com.ktg.common.annotation.Log;
import com.ktg.common.core.controller.BaseController;
import com.ktg.common.core.domain.AjaxResult;
@@ -94,7 +88,7 @@ public class WmStorageLocationController extends BaseController
return AjaxResult.error("库区名称已存在!");
}
wmStorageLocationService.insertWmStorageLocation(wmStorageLocation);
- wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_WAREHOUSE,wmStorageLocation.getLocationId(),wmStorageLocation.getLocationCode(),wmStorageLocation.getLocationName());
+ wmBarCodeUtil.generateBarCode(UserConstants.BARCODE_TYPE_STORAGELOCATION,wmStorageLocation.getLocationId(),wmStorageLocation.getLocationCode(),wmStorageLocation.getLocationName());
return AjaxResult.success(wmStorageLocation.getLocationId());
}
@@ -126,4 +120,28 @@ public class WmStorageLocationController extends BaseController
// }
return wmStorageLocationService.deleteWmStorageLocationByLocationIds(locationIds);
}
+
+
+ /**
+ * 设置库区下所有库位是否允许产品混放
+ */
+ @PreAuthorize("@ss.hasPermi('mes:wm:location:edit')")
+ @PostMapping("/setProductMixing")
+ public AjaxResult setProductMixing(@RequestParam("locationId") Long locationId, @RequestParam("flag") Boolean flag)
+ {
+ wmStorageAreaService.updateWmStorageAreaProductMixing(locationId, flag==true?UserConstants.YES:UserConstants.NO);
+ return AjaxResult.success();
+ }
+
+ /**
+ * 设置库区下所有库位是否允许批次混放
+ */
+ @PreAuthorize("@ss.hasPermi('mes:wm:location:edit')")
+ @PostMapping("/setBatchMixing")
+ public AjaxResult setBatchMixing(@RequestParam("locationId") Long locationId, @RequestParam("flag") Boolean flag)
+ {
+ wmStorageAreaService.updateWmStorageAreaBatchMixing(locationId, flag==true?UserConstants.YES:UserConstants.NO);
+ return AjaxResult.success();
+ }
+
}
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java
index 182e032..57a88d1 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/domain/WmStorageArea.java
@@ -55,8 +55,18 @@ public class WmStorageArea extends BaseEntity
@Excel(name = "是否启用")
private String enableFlag;
+ /** 是否冻结 */
+ @Excel(name = "是否冻结")
private String frozenFlag;
+ /** 是否允许产品混放 */
+ @Excel(name = "是否允许产品混放")
+ private String productMixing;
+
+ /** 是否允许批次混放 */
+ @Excel(name = "是否允许批次混放")
+ private String batchMixing;
+
/** 预留字段1 */
private String attr1;
@@ -168,6 +178,22 @@ public class WmStorageArea extends BaseEntity
this.frozenFlag = frozenFlag;
}
+ public String getProductMixing() {
+ return productMixing;
+ }
+
+ public void setProductMixing(String productMixing) {
+ this.productMixing = productMixing;
+ }
+
+ public String getBatchMixing() {
+ return batchMixing;
+ }
+
+ public void setBatchMixing(String batchMixing) {
+ this.batchMixing = batchMixing;
+ }
+
public void setAttr1(String attr1)
{
this.attr1 = attr1;
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java
index 2f000e3..f8649d4 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/mapper/WmStorageAreaMapper.java
@@ -51,6 +51,16 @@ public interface WmStorageAreaMapper
*/
public int updateWmStorageArea(WmStorageArea wmStorageArea);
+ /**
+ * 批量更新某个库区下库位的产品混合设置
+ */
+ public void updateWmStorageAreaProductMixing(WmStorageArea wmStorageArea);
+
+ /**
+ * 批量更新某个库区下库位的批次混合设置
+ */
+ public void updateWmStorageAreaBatchMixing(WmStorageArea wmStorageArea);
+
/**
* 删除库位设置
*
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java
index 1431ddc..febfe73 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/IWmStorageAreaService.java
@@ -51,6 +51,20 @@ public interface IWmStorageAreaService
*/
public int updateWmStorageArea(WmStorageArea wmStorageArea);
+ /**
+ * 批量更新某个库区下库位的产品混合设置
+ * @param locationId
+ * @param flag
+ */
+ public void updateWmStorageAreaProductMixing(Long locationId, String flag);
+
+ /**
+ * 批量更新某个库区下库位的批次混合设置
+ * @param locationId
+ * @param flag
+ */
+ public void updateWmStorageAreaBatchMixing(Long locationId, String flag);
+
/**
* 批量删除库位设置
*
diff --git a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java
index 244b8e9..5abb3c9 100644
--- a/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java
+++ b/ktg-mes/src/main/java/com/ktg/mes/wm/service/impl/WmStorageAreaServiceImpl.java
@@ -75,6 +75,22 @@ public class WmStorageAreaServiceImpl implements IWmStorageAreaService
return wmStorageAreaMapper.updateWmStorageArea(wmStorageArea);
}
+ @Override
+ public void updateWmStorageAreaProductMixing(Long locationId, String flag) {
+ WmStorageArea area = new WmStorageArea();
+ area.setLocationId(locationId);
+ area.setProductMixing(flag);
+ wmStorageAreaMapper.updateWmStorageAreaProductMixing(area);
+ }
+
+ @Override
+ public void updateWmStorageAreaBatchMixing(Long locationId, String flag) {
+ WmStorageArea area = new WmStorageArea();
+ area.setLocationId(locationId);
+ area.setBatchMixing(flag);
+ wmStorageAreaMapper.updateWmStorageAreaBatchMixing(area);
+ }
+
/**
* 批量删除库位设置
*
diff --git a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
index ab0d23a..06c4d50 100644
--- a/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
+++ b/ktg-mes/src/main/resources/mapper/wm/WmStorageAreaMapper.xml
@@ -16,6 +16,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+
+
@@ -28,7 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
- select area_id, area_code, area_name, location_id, area, max_loa, position_x, position_y, position_z, enable_flag, frozen_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_storage_area
+ select area_id, area_code, area_name, location_id, area, max_loa, position_x, position_y, position_z, product_mixing, batch_mixing, enable_flag, frozen_flag, remark, attr1, attr2, attr3, attr4, create_by, create_time, update_by, update_time from wm_storage_area
@@ -69,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
position_z,
enable_flag,
frozen_flag,
+ product_mixing,
+ batch_mixing,
remark,
attr1,
attr2,
@@ -90,6 +97,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{positionZ},
#{enableFlag},
#{frozenFlag},
+ #{productMixing},
+ #{batchMixing},
#{remark},
#{attr1},
#{attr2},
@@ -115,6 +124,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
position_z = #{positionZ},
enable_flag = #{enableFlag},
frozen_flag = #{frozenFlag},
+ product_mixing = #{productMixing},
+ batch_mixing = #{batchMixing},
remark = #{remark},
attr1 = #{attr1},
attr2 = #{attr2},
@@ -128,6 +139,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where area_id = #{areaId}
+
+ update wm_storage_area
+ set product_mixing = #{productMixing}
+ where location_id = #{locationId}
+
+
+
+ update wm_storage_area
+ set batch_mixing = #{batchMixing}
+ where location_id = #{locationId}
+
+
delete from wm_storage_area where area_id = #{areaId}