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

fix:修复拣选位启停失效问题；

Browse Source
This commit is contained in:
gongbaoxiong
2025-01-10 15:33:26 +08:00
parent 17d264382f
commit 26da5008d4
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/md_manage/group_dick/service/dao/mapper/xml/MdGruopDickMapper.xml
View File

@@ -24,10 +24,10 @@
md_group_dick md_group_dick
<where> <where>
<if test="query.material_code != null and query.material_code != ''"> <if test="query.material_code != null and query.material_code != ''">
and material_code = #{query.material_code} and material_code LIKE '%${query.material_code}%'
</if> </if>
<if test="query.vehicle_code != null and query.vehicle_code != ''"> <if test="query.vehicle_code != null and query.vehicle_code != ''">
and vehicle_code = #{query.vehicle_code} and vehicle_code LIKE '%${query.vehicle_code}%'
</if> </if>
<if test="query.pcsn != null and query.pcsn != ''"> <if test="query.pcsn != null and query.pcsn != ''">
and pcsn = #{query.pcsn} and pcsn = #{query.pcsn}

5
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java
View File

@@ -91,10 +91,13 @@ public class DeviceManageController {
@Log("切换拣选工位启停模式") @Log("切换拣选工位启停模式")
public ResponseEntity<TableDataInfo> changeModePick(@RequestBody ComTp form) { public ResponseEntity<TableDataInfo> changeModePick(@RequestBody ComTp form) {
Assert.noNullElements(new Object[]{form.getDevice_code(),form.getMode()},"请求参数不能为空"); Assert.noNullElements(new Object[]{form.getDevice_code(),form.getMode()},"请求参数不能为空");
if (!"1207".equals(form.getDevice_code()) && !"1210".equals(form.getDevice_code())) {
throw new BadRequestException("您输入的拣选位不存在，请输入1207或1210拣选位!");
}
wmsToAcsService.changeMode(form.getDevice_code(),"pinkStartStop",form.getMode()); wmsToAcsService.changeMode(form.getDevice_code(),"pinkStartStop",form.getMode());
LambdaUpdateWrapper<SchBasePoint> updateWrapper = new LambdaUpdateWrapper<>(); LambdaUpdateWrapper<SchBasePoint> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.set(SchBasePoint::getIs_used,form.getMode()); updateWrapper.set(SchBasePoint::getIs_used,form.getMode());
updateWrapper.eq(SchBasePoint::getCode,form.getDevice_code()); updateWrapper.eq(SchBasePoint::getCode, "1207".equals(form.getDevice_code())?"1308":"1311");
iSchBasePointService.update(updateWrapper); iSchBasePointService.update(updateWrapper);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
} }

4
wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue
View File

@@ -11,11 +11,11 @@
label-width="100px" label-width="100px"
label-suffix=":" label-suffix=":"
> >
<el-form-item label="托盘号"> <el-form-item label="载具号">
<el-input <el-input
v-model="query.vehicle_code" v-model="query.vehicle_code"
clearable clearable
placeholder="托盘号" placeholder="载具号"
style="width: 200px;" style="width: 200px;"
class="filter-item" class="filter-item"
/> />