Skip to content

M
mini-wms
Commit 583b1606 by yubin
Options

Merge remote-tracking branch 'origin/master'

parents ebf1004d 141d9960
正在显示 包含 69 行增加 和 60 行删除
ruoyi-admin-vue/src/views/inventory/inbound/details.vue
......@@ -112,17 +112,17 @@
@selection-change="handleSelectionChange"
:row-key="(row) => row.materialId + '_' + row.orderId + '_' + row.warehousesName + '_' + row.locationName"
>
<el-table-column label="物料SAPNO" align="center" prop="sapNo" width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200"/>
<el-table-column label="关联入库单" align="center" prop="orderId" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" :show-overflow-tooltip="true" width="200"/>
<el-table-column label="源仓库" align="center" prop="warehousesName" width="200"/>
<el-table-column label="库位" align="center" prop="locationName" width="200"/>
<el-table-column label="入库数量" align="center" prop="actualQuantity" width="200"/>
<el-table-column label="件数" align="center" prop="actualPackages" width="200"/>
<el-table-column label="单价" align="center" prop="unitPrice" width="200"/>
<el-table-column label="入库批次物料总价" align="center" prop="totalPrice" width="200"/>
<el-table-column label="标签颜色" align="center" prop="labelColor" width="200">
<el-table-column label="物料SAPNO" align="center" prop="sapNo" min-width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" min-width="200"/>
<el-table-column label="关联入库单" align="center" prop="orderId" :show-overflow-tooltip="true" min-width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" :show-overflow-tooltip="true" min-width="200"/>
<el-table-column label="源仓库" align="center" prop="warehousesName" min-width="200"/>
<el-table-column label="库位" align="center" prop="locationName" min-width="200"/>
<el-table-column label="入库数量" align="center" prop="actualQuantity" min-width="200"/>
<el-table-column label="件数" align="center" prop="actualPackages" min-width="200"/>
<el-table-column label="单价" align="center" prop="unitPrice" min-width="200"/>
<el-table-column label="入库批次物料总价" align="center" prop="totalPrice" min-width="200"/>
<el-table-column label="标签颜色" align="center" prop="labelColor" min-width="200">
<template slot-scope="scope">
<el-tag
:type="getDictListClass('label_color', scope.row.labelColor)"
......@@ -132,8 +132,8 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" width="200"/>
<el-table-column label="入库时间" align="center" prop="inboundDate" width="200">
<el-table-column label="备注" align="center" prop="remark" min-width="200"/>
<el-table-column label="入库时间" align="center" prop="inboundDate" min-width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span>
</template>
......
ruoyi-admin-vue/src/views/inventory/inbound/index.vue
......@@ -159,12 +159,12 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="入库单号" align="center" prop="orderId" width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" width="200"/>
<el-table-column label="系统编号" align="center" prop="systemNo" width="200"/>
<el-table-column label="入库单号" align="center" prop="orderId" min-width="200"/>
<el-table-column label="批次号" align="center" prop="batchId" min-width="200"/>
<el-table-column label="系统编号" align="center" prop="systemNo" min-width="200"/>
<!-- 新增：表格显示货主名称 -->
<el-table-column label="货主" align="center" prop="ownerName" width="200"/>
<el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" width="200">
<el-table-column label="货主" align="center" prop="ownerName" min-width="200"/>
<el-table-column label="入库类型" align="center" prop="orderTypeId" :show-overflow-tooltip="true" min-width="200">
<template slot-scope="scope">
<el-tag
:type="getDictListClass('inbound_outbound_type',scope.row.orderTypeId)"
......@@ -174,7 +174,7 @@
</template>
</el-table-column>
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" width="200">
<el-table-column label="订单类型" align="center" prop="orderType" :show-overflow-tooltip="true" min-width="200">
<template slot-scope="scope">
<el-tag
:type="getDictListClass('order_type',scope.row.orderType)"
......@@ -183,15 +183,15 @@
</el-tag>
</template>
</el-table-column>
<el-table-column label="入库单状态" align="center" prop="orderStatus" width="200">
<el-table-column label="入库单状态" align="center" prop="orderStatus" min-width="200">
<!-- 状态显示 -->
<template slot-scope="scope">
<el-tag :type="getDictListClass('inbound_status',scope.row.orderStatus+'')" size="small" width="200">
<el-tag :type="getDictListClass('inbound_status',scope.row.orderStatus+'')" size="small" min-width="200">
{{ getDictLabel('inbound_status',scope.row.orderStatus+"") }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="入库时间" align="center" prop="inboundDate" width="200">
<el-table-column label="入库时间" align="center" prop="inboundDate" min-width="200">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate,'{y}-{m}-{d}') }}</span>
</template>
......@@ -694,9 +694,9 @@ export default {
systemNo: null,
batchId: null,
warehouseId: null,
ownerId: null,
ownerId: null,
ownerName: null,
ownerCode: null,
ownerCode: null,
orderStatus: null,
orderType: null,
inboundDateStart: null,
......
ruoyi-admin-vue/src/views/inventory/locations/index.vue
......@@ -228,42 +228,42 @@
</template>
</el-table-column>
<el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="库位编码" align="center" prop="locationCode" width="120" fixed />
<el-table-column label="库位名称" align="center" prop="locationName" width="150" />
<el-table-column label="库位编码" align="center" prop="locationCode" min-width="120" fixed />
<el-table-column label="库位名称" align="center" prop="locationName" min-width="150" />
<!-- <el-table-column label="仓库" align="center" prop="warehousesName" width="180">
<template slot-scope="scope">
{{ scope.row.warehousesName }}
</template>
</el-table-column> -->
<el-table-column label="库位类型" align="center" prop="locationType" width="100">
<el-table-column label="库位类型" align="center" prop="locationType" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.location_type" :value="scope.row.locationType"/>
</template>
</el-table-column>
<el-table-column label="库位使用" align="center" prop="locationUsage" width="100">
<el-table-column label="库位使用" align="center" prop="locationUsage" min-width="100">
<template slot-scope="scope">
<dict-tag :options="dict.type.location_usage" :value="scope.row.locationUsage"/>
</template>
</el-table-column>
<el-table-column label="上架区" align="center" prop="zoneCode" width="100" />
<el-table-column label="拣货区" align="center" prop="pickingArea" width="100" />
<el-table-column label="允许混放产品" align="center" prop="allowMixedProducts" width="120">
<el-table-column label="上架区" align="center" prop="zoneCode" min-width="100" />
<el-table-column label="拣货区" align="center" prop="pickingArea" min-width="100" />
<el-table-column label="允许混放产品" align="center" prop="allowMixedProducts" min-width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedProducts"/>
</template>
</el-table-column>
<el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" width="120" >
<el-table-column label="允许混放批次" align="center" prop="allowMixedBatches" min-width="120" >
<template slot-scope="scope">
<dict-tag :options="dict.type.yorn" :value="scope.row.allowMixedBatches"/>
</template>
</el-table-column>
<el-table-column label="上架顺序" align="center" prop="putawayOrder" width="100" />
<el-table-column label="拣货顺序" align="center" prop="pickingOrder" width="100" />
<el-table-column label="上架顺序" align="center" prop="putawayOrder" min-width="100" />
<el-table-column label="拣货顺序" align="center" prop="pickingOrder" min-width="100" />
<el-table-column label="库位容量(千克)" align="center" prop="capacity" width="120" />
<el-table-column label="体积容量(立方米)" align="center" prop="volumeCapacity" width="120" />
<el-table-column label="允许存放的危险等级" align="center" prop="allowedHazardLevels" width="140" />
<el-table-column label="允许存放的物料名称" align="center" prop="allowedCategoryNames" width="200">
<el-table-column label="库位容量(千克)" align="center" prop="capacity" min-width="120" />
<el-table-column label="体积容量(立方米)" align="center" prop="volumeCapacity" min-width="120" />
<el-table-column label="允许存放的危险等级" align="center" prop="allowedHazardLevels" min-width="140" />
<el-table-column label="允许存放的物料名称" align="center" prop="allowedCategoryNames" min-width="200">
<template slot-scope="scope">
<el-tooltip
:content="scope.row.allowedCategoryNames"
......
ruoyi-admin-vue/src/views/inventory/orders/index.vue
......@@ -171,45 +171,45 @@
:key="tableKey"
>
<el-table-column type="selection" width="55" align="center" fixed />
<el-table-column label="出库单号" align="center" prop="orderId" width="150" fixed/>
<el-table-column label="系统编号" align="center" prop="systemNo" width="150" />
<el-table-column label="出库类型" align="center" prop="orderTypeId" width="120">
<el-table-column label="出库单号" align="center" prop="orderId" min-width="150" fixed/>
<el-table-column label="系统编号" align="center" prop="systemNo" min-width="150" />
<el-table-column label="出库类型" align="center" prop="orderTypeId" min-width="120">
<template slot-scope="scope">
<dict-tag v-if="dict.type.inbound_outbound_type" :options="dict.type.inbound_outbound_type" :value="scope.row.orderTypeId"/>
<span v-else>-</span>
</template>
</el-table-column>
<!-- 新增：订单类型列 -->
<el-table-column label="订单类型" align="center" prop="orderType" width="120">
<el-table-column label="订单类型" align="center" prop="orderType" min-width="120">
<template slot-scope="scope">
<dict-tag v-if="dict.type.order_type" :options="dict.type.order_type" :value="scope.row.orderType"/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="批次" align="center" prop="batchCode" width="120" />
<el-table-column label="仓库" align="center" prop="warehouseName" width="120">
<el-table-column label="批次" align="center" prop="batchCode" min-width="120" />
<el-table-column label="仓库" align="center" prop="warehouseName" min-width="120">
<template slot-scope="scope">
{{ scope.row.warehouseName || '-' }}
</template>
</el-table-column>
<el-table-column label="货主" align="center" prop="ownerName" width="120">
<el-table-column label="货主" align="center" prop="ownerName" min-width="120">
<template slot-scope="scope">
{{ scope.row.ownerName || '-' }}
</template>
</el-table-column>
<el-table-column label="订单状态" align="center" prop="orderStatus" width="150">
<el-table-column label="订单状态" align="center" prop="orderStatus" min-width="150">
<template slot-scope="scope">
<dict-tag v-if="dict.type.outbound_order_status" :options="dict.type.outbound_order_status" :value="scope.row.orderStatus"/>
<span v-else>-</span>
</template>
</el-table-column>
<el-table-column label="出库日期" align="center" prop="inboundDate" width="150">
<el-table-column label="出库日期" align="center" prop="inboundDate" min-width="150">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.inboundDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="目的地" align="center" prop="destination" width="150" />
<el-table-column label="备注" align="center" prop="remark" width="150" />
<el-table-column label="目的地" align="center" prop="destination" min-width="150" />
<el-table-column label="备注" align="center" prop="remark" min-width="150" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220" fixed="right">
<template slot-scope="scope">
<!-- 详细查看按钮 - 独立触发 -->
......
ruoyi-admin-vue/src/views/inventory/stocktakes/index.vue
......@@ -91,7 +91,7 @@
type="text"
icon="el-icon-edit"
@click="handleCheck(scope.row)"
v-if="scope.row.stocktakeStatus === '1'"
v-if="scope.row.stocktakeStatus !== '3'"
v-hasPermi="['inventory:stocktakes:check']"
>盘点</el-button>
<el-button
......
ruoyi-admin/src/main/resources/application-druid.yml
......@@ -9,9 +9,9 @@ spring:
master:
# 数据库连接地址
#生產
#url: jdbc:mysql://172.19.1.150:9012/inventory_manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
#username: root # 数据库用户名
#password: 'Aa123456'
# url: jdbc:mysql://172.19.1.150:9012/inventory_manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false
# username: root # 数据库用户名
# password: 'Aa123456'
#測試
url: jdbc:mysql://demo.docmis.cn:23500/inventory_manager?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&useSSL=false&allowMultiQueries=true
username: root
......
ruoyi-admin/src/main/resources/application.yml
......@@ -41,7 +41,7 @@ logging:
user:
password:
# 密码最大错误次数
maxRetryCount: 5
maxRetryCount: 30
# 密码锁定时间（默认10分钟）
lockTime: 10
......@@ -124,7 +124,7 @@ referer:
# 防盗链开关
enabled: false
# 允许的域名列表
allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip
allowed-domains: localhost,127.0.0.1
# 防止XSS攻击
xss:
......
ruoyi-inventory/src/main/java/com/ruoyi/inventory/controller/WarehousesController.java
......@@ -4,6 +4,8 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.ruoyi.common.config.WarehouseConfig;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
......@@ -36,6 +38,7 @@ public class WarehousesController extends BaseController
@GetMapping("/list")
public TableDataInfo list(Warehouses warehouses)
{
warehouses.setLocalId(WarehouseConfig.DEFAULT_WAREHOUSE_ID);
startPage();
List<Warehouses> list = warehousesService.selectWarehousesList(warehouses);
return getDataTable(list);
......@@ -49,6 +52,7 @@ public class WarehousesController extends BaseController
@PostMapping("/export")
public void export(HttpServletResponse response, Warehouses warehouses)
{
warehouses.setLocalId(WarehouseConfig.DEFAULT_WAREHOUSE_ID);
List<Warehouses> list = warehousesService.selectWarehousesList(warehouses);
ExcelUtil<Warehouses> util = new ExcelUtil<Warehouses>(Warehouses.class);
util.exportExcel(response, list, "仓库数据");
......@@ -120,6 +124,7 @@ public class WarehousesController extends BaseController
@GetMapping("/listForSelector")
public TableDataInfo listForSelector(Warehouses warehouses)
{
warehouses.setLocalId(WarehouseConfig.DEFAULT_WAREHOUSE_ID);
startPage();
List<Warehouses> list = warehousesService.selectWarehousesList(warehouses);
return getDataTable(list);
......
ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/Warehouses.java
package com.ruoyi.inventory.domain;
import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.annotation.Excel;
......@@ -11,6 +12,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
* @author ruoyi
* @date 2025-12-01
*/
@Data
public class Warehouses extends BaseEntity
{
private static final long serialVersionUID = 1L;
......@@ -68,6 +70,8 @@ public class Warehouses extends BaseEntity
/** 排序号 */
private String updateUserCode;
private String localId;
public void setId(String id)
{
this.id = id;
......
ruoyi-inventory/src/main/resources/mapper/inventory/InboundOrderItemsMapper.xml
......@@ -364,8 +364,8 @@
FROM inbound_orders io
INNER JOIN inbound_order_items ioi ON io.id = ioi.inbound_order_id
INNER JOIN materials ms ON ms.id = ioi.material_id
inner join warehouses w on ioi.warehouse_id = w.id
inner join storage_locations sl on ioi.location_id = sl.id
left join warehouses w on ioi.warehouse_id = w.id
left join storage_locations sl on ioi.location_id = sl.id
<where>
io.order_status = 2
<if test="sapNo != null and sapNo != ''">
......
ruoyi-inventory/src/main/resources/mapper/inventory/InventoryMapper.xml
......@@ -385,7 +385,7 @@
<select id="selectstocktakeItemsList" resultMap="StocktakeItemsResult">
select id as inventory_id,material_id, batch_id, location_id, warehouses_id as warehouse_id, quantity as system_quantity
from inventory
where is_used = 1 and inventory_status = 1
where is_used = 1 and inventory_status = 1 and quantity != 0
order by warehouse_id,location_id,material_id
</select>
......
ruoyi-inventory/src/main/resources/mapper/inventory/WarehousesMapper.xml
......@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWarehousesList" parameterType="Warehouses" resultMap="WarehousesResult">
<include refid="selectWarehousesVo"/>
where is_used=1
where is_used=1 and id != #{localId}
<if test="warehousesCode != null and warehousesCode != ''"> and warehouses_code = #{warehousesCode}</if>
<if test="warehousesName != null and warehousesName != ''"> and warehouses_name like concat('%', #{warehousesName}, '%')</if>
<if test="warehouseType != null "> and warehouse_type = #{warehouseType}</if>
......@@ -58,7 +58,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</select>
<!-- 获取仓库 的 warehouses_code 仓库编码 warehouses_name 做成字典-->
<select id="getMapList" resultType="java.util.Map">
select id, IFNULL(warehouses_name, '') as warehouses_name from warehouses where is_used = 1;
select id, IFNULL(warehouses_name, '') as warehouses_name from warehouses where is_used = 1 and id != 'local';
</select>
<insert id="insertWarehouses" parameterType="Warehouses">
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论