root/yongYuJiaJu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改库存分配规则，修复空位盘点只能一整排

Browse Source
This commit is contained in:
liyongde
2023-02-24 00:21:06 +08:00
parent 81bbac29de
commit d3b0f69d7b
3 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/GjxSendMaterialTask.java
View File

@@ -226,14 +226,13 @@ public class GjxSendMaterialTask extends AbstractAcsTask {
}
}
if (ObjectUtil.isNotEmpty(json1)) { // json1: 对应相同物料的点位
Integer block_num = json1.getInteger("block_num");
Integer col_num = json1.getInteger("col_num");
Integer row_num = json1.getInteger("row_num");
if (col_num != 1) {
// 因为找到的是对应相同的物料点，所以是下一个位置
JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'", "col_num desc").uniqueResult(0); // and col_num ='" + (col_num - 1) + "'
JSONObject firstRow = pointTab.query("block_num = '" + block_num + "' and row_num = '" + row_num + "'and col_num = '" + (col_num - 1) +"' and lock_type = '1' and point_status = '1' and is_used = '1' and is_delete = '0'").uniqueResult(0);
if (ObjectUtil.isEmpty(firstRow)) throw new BadRequestException("数据错误，请校验!");
taskObj.put("point_code2", firstRow.getString("point_code"));
taskObj.put("update_time", DateUtil.now());

37
lms/nladmin-system/src/main/java/org/nl/wms/sch/tasks/sendMaterial/wql/QSCH_gjxSendMaterial_01.wql
View File

@@ -67,7 +67,7 @@
OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like "%" 输入.vehicle_type "%"
ENDOPTION
AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num AND p2.col_num = '1'
AND '3' <> (SELECT p2.point_status FROM SCH_BASE_Point p2 WHERE p2.block_num = p.block_num AND p2.row_num = p.row_num
AND p2.col_num = (SELECT MIN(p3.col_num) FROM SCH_BASE_Point p3 WHERE p3.block_num = p2.block_num AND p3.row_num = p2.row_num AND p3.is_used = '1' AND p3.is_delete = '0'))
ORDER BY block_num,row_num,col_num
ENDSELECT
@@ -77,24 +77,35 @@
IF 输入.flag = "2"
QUERY
SELECT
block_num,
row_num,
p.block_num,
p.row_num,
COUNT(*) AS sum
FROM
SCH_BASE_Point p
WHERE
p.is_delete = '0'
AND is_used = '1'
AND region_code = 'YSQA01'
AND point_status = '1'
AND lock_type = '1'
AND p.is_used = '1'
AND p.region_code = 'YSQA01'
AND p.point_status = '1'
AND p.lock_type = '1'
OPTION 输入.vehicle_type <> ""
p.can_vehicle_type like "%" 输入.vehicle_type "%"
ENDOPTION
GROUP BY block_num,row_num
HAVING sum in ('9','13')
ORDER BY block_num,row_num
ENDSELECT
p.can_vehicle_type like "%" 输入.vehicle_type "%"
ENDOPTION
GROUP BY p.block_num, p.row_num
HAVING sum = (
SELECT
COUNT(*) AS s
FROM
sch_base_point p2
WHERE
p2.region_code = 'YSQA01'
AND p.block_num = p2.block_num
AND p.row_num = p2.row_num
AND p2.is_used = '1'
AND p2.is_delete = '0'
)
ORDER BY p.block_num, p.row_num
ENDSELECT
ENDQUERY
ENDIF

5
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -274,7 +274,7 @@
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item label="载具类型" prop="vehicle_code">
<el-form-item label="载具类型" prop="can_vehicle_types">
<!-- <el-input v-model="" clearable style="width: 370px;" />-->
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择">
<el-option
@@ -451,6 +451,9 @@ export default {
],
lock_type: [
{ required: true, message: '锁定类型不能为空', trigger: 'blur' }
],
can_vehicle_types: [
{ required: true, message: '载具存放类型不能为空', trigger: 'blur' }
]
}