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

优化0120

Browse Source
This commit is contained in:
zj
2026-01-20 16:44:09 +08:00
parent 35763414e1
commit aa4c561151
4 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ruoyi-admin/src/main/java/com/ruoyi/api/service/impl/ToWmsServiceImpl.java
View File

@@ -247,7 +247,7 @@ public class ToWmsServiceImpl implements IToWmsService {
if ("2".equals(requestEnter.getFloor())){ if ("2".equals(requestEnter.getFloor())){
AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill); AjaxResult workshopInboundOrder = toErpService.createWorkshopInboundOrder(basProduct,erpBill);
if (!workshopInboundOrder.isSuccess()){ if (!workshopInboundOrder.isSuccess()){
throw new RuntimeException("创建工单失败"); throw new RuntimeException("创建工单失败,人工处理");
} }
} }
@@ -494,6 +494,11 @@ public class ToWmsServiceImpl implements IToWmsService {
} }
} }
int size1 = Convert.toInt(basProduct.getSpare38());
if (size1 > 1080){
return AjaxResult.error("货物超高");
}
//超大托盘不处理 直接返回 //超大托盘不处理 直接返回
if (size == 5) { if (size == 5) {
return new AjaxResult(3, "超大托盘"); return new AjaxResult(3, "超大托盘");

4
ruoyi-ui/src/views/out/addOutStockout.vue
View File

@@ -95,7 +95,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="规格" prop="spare1"> <el-form-item label="规格" prop="spare1">
<el-input v-model="queryParams.spare1" placeholder="请输入规格" <el-input v-model="queryParams.spare1" placeholder="请输入规格"
clearable clearable
@keyup.enter.native="handleQuery"/> @keyup.enter.native="handleQuery"/>
@@ -114,7 +114,7 @@
<el-input v-model="queryParams.spare6" placeholder="请输入序列号" <el-input v-model="queryParams.spare6" placeholder="请输入序列号"
clearable clearable
@keyup.enter.native="handleQuery"/> @keyup.enter.native="handleQuery"/>
</el-form-item>--> </el-form-item>
<el-form-item label="订单号" prop="orderId"> <el-form-item label="订单号" prop="orderId">
<el-input v-model="queryParams.orderId" placeholder="请输入订单号" <el-input v-model="queryParams.orderId" placeholder="请输入订单号"
clearable clearable

4
ruoyi-ui/src/views/stock/management/index.vue
View File

@@ -78,7 +78,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="型号" prop="spare3"><!-- 品名 --> <el-form-item label="型号" prop="spare3"><!-- 型号 -->
<el-input <el-input
v-model="queryParams.spare3" v-model="queryParams.spare3"
placeholder="请输入型号" placeholder="请输入型号"
@@ -86,7 +86,7 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="规格" prop="spare1"><!-- 品名 --> <el-form-item label="规格" prop="spare1"><!-- 规格 -->
<el-input <el-input
v-model="queryParams.spare1" v-model="queryParams.spare1"
placeholder="请输入规格" placeholder="请输入规格"

24
ruoyi-ui/src/views/stock/pointOut.vue
View File

@@ -25,14 +25,22 @@
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<!-- <el-form-item label="批次" prop="lotNo">&lt;!&ndash; 库存id &ndash;&gt;--> <el-form-item label="品名" prop="productName"><!-- 库存id -->
<!-- <el-input--> <el-input
<!-- v-model="queryParams.lotNo"--> v-model="queryParams.productName"
<!-- placeholder="请输入批次"--> placeholder="请输入品名"
<!-- clearable--> clearable
<!-- @keyup.enter.native="handleQuery"--> @keyup.enter.native="handleQuery"
<!-- />--> />
<!-- </el-form-item>--> </el-form-item>
<el-form-item label="规格" prop="spare1"><!-- 库存id -->
<el-input
v-model="queryParams.spare1"
placeholder="请输入规格"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="巷道" prop="roadwayId"><!-- 货位id --> <el-form-item label="巷道" prop="roadwayId"><!-- 货位id -->
<el-input <el-input
v-model="queryParams.roadwayId" v-model="queryParams.roadwayId"