lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

限制新增弹框必填项必填，补充KPI国际化

Browse Source
This commit is contained in:
猫猫guowen
2025-08-19 14:40:47 +08:00
parent 0e9da3259f
commit ce3d083c6d
17 changed files with 175 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/bas/container/controller/BasContainerController.java
View File

@@ -77,6 +77,8 @@ public class BasContainerController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody BasContainer basContainer)
{
// 自动获取当前登录用户作为操作人
basContainer.setOperationMan(getUsername());
return toAjax(basContainerService.insertBasContainer(basContainer));
}
@@ -88,6 +90,8 @@ public class BasContainerController extends BaseController
@PutMapping
public AjaxResult edit(@RequestBody BasContainer basContainer)
{
// 自动获取当前登录用户作为操作人
basContainer.setOperationMan(getUsername());
return toAjax(basContainerService.updateBasContainer(basContainer));
}

12
ruoyi-admin/src/main/java/com/ruoyi/kpi/service/impl/KpiServiceImpl.java
View File

@@ -250,12 +250,12 @@ public class KpiServiceImpl implements KpiService
roadwayIds.add(roadwayId);
String statusName;
switch (Integer.parseInt(status)) {
case 1: statusName = "空货位"; break;
case 2: statusName = "满货位"; break;
case 3: statusName = "入库分配"; break;
case 4: statusName = "出库分配"; break;
case 5: statusName = "入库需盘点"; break;
case 6: statusName = "出库需盘点"; break;
case 1: statusName = "1"; break; // 空货位
case 2: statusName = "2"; break; // 满货位
case 3: statusName = "3"; break; // 入库分配
case 4: statusName = "4"; break; // 出库分配
case 5: statusName = "5"; break; // 入库需盘点
case 6: statusName = "6"; break; // 出库需盘点
default: continue;
}

2
ruoyi-admin/src/main/resources/mapper/bas/BasContainerMapper.xml
View File

@@ -25,7 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasContainerList" parameterType="BasContainer" resultMap="BasContainerResult">
<include refid="selectBasContainerVo"/>
<where>
<if test="containerId != null and containerId != ''"> and container_id = #{containerId}</if>
<if test="containerId != null and containerId != ''"> and container_id like concat('%', #{containerId}, '%')</if>
<if test="portName != null and portName != ''"> and port_name = #{portName}</if>
<if test="status != null "> and status = #{status}</if>
<if test="productTypeQuantity != null "> and product_type_quantity = #{productTypeQuantity}</if>

12
ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeFormatMapper.xml
View File

@@ -26,12 +26,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBasTraycodeFormatList" parameterType="BasTraycodeFormat" resultMap="BasTraycodeFormatResult">
<include refid="selectBasTraycodeFormatVo"/>
<where>
<if test="barcodeFormat != null and barcodeFormat != ''"> and barcode_format = #{barcodeFormat}</if>
<if test="serialRule != null and serialRule != ''"> and serial_rule = #{serialRule}</if>
<if test="serialExample != null and serialExample != ''"> and serial_example = #{serialExample}</if>
<if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
<if test="minNum != null "> and min_num = #{minNum}</if>
<if test="maxNum != null "> and max_num = #{maxNum}</if>
<if test="barcodeFormat != null and barcodeFormat != ''"> and barcode_format like concat('%', #{barcodeFormat}, '%')</if>
<if test="serialRule != null and serialRule != ''"> and serial_rule like concat('%',#{serialRule}, '%')</if>
<if test="serialExample != null and serialExample != ''"> and serial_example like concat('%',#{serialExample}, '%')</if>
<if test="remarks != null and remarks != ''"> and remarks like concat('%',#{remarks}, '%')</if>
<if test="minNum != null "> and min_num like concat('%',#{minNum}, '%')</if>
<if test="maxNum != null "> and max_num like concat('%',#{maxNum}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and spare3 = #{spare3}</if>

2
ruoyi-admin/src/main/resources/mapper/bas/BasTraycodeMapper.xml
View File

@@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectBasTraycodeVo"/>
<where>
<if test="formatId != null "> and bt.format_id = #{formatId}</if>
<if test="trayCode != null and trayCode != ''"> and bt.tray_code = #{trayCode}</if>
<if test="trayCode != null and trayCode != ''"> and bt.tray_code like concat('%',#{trayCode}, '%')</if>
<if test="spare1 != null and spare1 != ''"> and bt.spare1 = #{spare1}</if>
<if test="spare2 != null and spare2 != ''"> and bt.spare2 = #{spare2}</if>
<if test="spare3 != null and spare3 != ''"> and bt.spare3 = #{spare3}</if>