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

rev:手持拣选功能

Browse Source
This commit is contained in:
zhangzq
2024-11-13 11:15:21 +08:00
parent e0ff6ad87f
commit cf35e1b9c0
5 changed files with 44 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,17 +18,20 @@ import org.nl.wms.external_system.acs.service.AcsToWmsService;
import org.nl.wms.external_system.acs.service.WmsToAcsService;
import org.nl.wms.md_manage.vehicleMater.service.IMdPbVehicleMaterService;
import org.nl.wms.md_manage.vehicleMater.service.dao.MdPbVehicleMater;
import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo;
import org.nl.wms.pda_manage.devicemanage.dto.ComTp;
import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.text.Format;
import java.util.List;
/**
*设备操控
@@ -95,10 +98,8 @@ public class DeviceManageController {
if (vehicleInfo == null ){
throw new BadRequestException(String.format(vehicleCode+"载具信息不存在"));
}
MdPbVehicleMater vehicleMater = iMdPbVehicleMaterService.getOne(new QueryWrapper<MdPbVehicleMater>()
.eq("vehicle_code", vehicleCode)
.eq("is_delete", false));
if (vehicleMater == null){
List<MdPbVehicleMaterVo> item = iMdPbVehicleMaterService.getVehicleMaters(vehicleCode);
if (CollectionUtils.isEmpty(item)){
throw new BadRequestException(String.format(vehicleCode+"载具组盘信息不存在"));
}
wmsToAcsService.toCommand(device_code,"1",vehicleInfo.getH());

34
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/pick/PdaPickController.java
View File

@@ -3,10 +3,20 @@ package org.nl.wms.pda_manage.pick;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import org.apache.commons.lang3.StringUtils;
import org.nl.common.TableDataInfo;
import org.nl.common.anno.Log;
import org.nl.common.domain.exception.BadRequestException;
import org.nl.common.enums.StatusEnum;
import org.nl.wms.md_manage.group_dick.service.IMdGruopDickService;
import org.nl.wms.md_manage.group_dick.service.dao.MdGruopDick;
import org.nl.wms.pda_manage.pick.dto.PdaPickQuery;
import org.nl.wms.pda_manage.pick.dto.PickFormVo;
import org.nl.wms.pda_manage.pick.dto.PickTask;
import org.nl.wms.pm_manage.form_data.service.IPmFormDataService;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -35,16 +45,30 @@ public class PdaPickController {
@PostMapping("queryPick")
@SaIgnore
@Log("查询拣选作业")
public ResponseEntity<Object> queryPick(@RequestBody JSONObject form) {
iMdGruopDickService.groupDick(form);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
public ResponseEntity<PickFormVo> queryPick(@RequestBody PdaPickQuery form) {
if (StringUtils.isEmpty(form.getVehicle_code())){
throw new BadRequestException("查询失败：托盘信息不能为空");
}
PmFormData one = iPmFormDataService.getOne(new QueryWrapper<PmFormData>()
.eq("vehicle_code", form.getVehicle_code())
.eq("form_type", "Picking")
.lt("status", StatusEnum.FLOW_STATUS.code("完成")));
if (one ==null){
throw new BadRequestException("当前托盘"+form.getVehicle_code()+"不存在拣选中的作业");
}
PickFormVo formVo = new PickFormVo();
BeanUtils.copyProperties(one,formVo);
formVo.setPoint_code(one.getForm_data().getString("point_code"));
formVo.setProduct_area(one.getForm_data().getString("product_area"));
formVo.setStor_code(one.getForm_data().getString("stor_code"));
return new ResponseEntity<>(formVo,HttpStatus.OK);
}
@PostMapping("savePickTask")
@SaIgnore
@Log("手持拣选确认")
public ResponseEntity<Object> inStorage(@RequestBody JSONObject form) {
iMdGruopDickService.groupDick(form);
public ResponseEntity<Object> savePickTask(@RequestBody PickTask pickTask) {
// iMdGruopDickService.groupDick(form);
return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK);
}
}

2
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/controller/PmFormDataController.java
View File

@@ -37,6 +37,8 @@ public class PmFormDataController {
@GetMapping()
@Log("查询数据")
public ResponseEntity<Object> queryAll(FormDataQuery query, PageQuery page) {
return new ResponseEntity<>(TableDataInfo.build(iPmFormDataService.queryTree(query,page)), HttpStatus.OK);
}

3
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/IPmFormDataService.java
View File

@@ -2,6 +2,7 @@ package org.nl.wms.pm_manage.form_data.service;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.nl.common.domain.entity.PageQuery;
import org.nl.wms.config_manage.form_struc.service.dao.BmFormStruc;
import org.nl.wms.pm_manage.form_data.service.dao.PmFormData;
@@ -32,7 +33,7 @@ public interface IPmFormDataService extends IService<PmFormData> {
Object queryAll(FormDataQuery query, PageQuery page);
List<PmFormDataDto> queryTree(FormDataQuery query, PageQuery page);
Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery page);
/**
* 一对多同步改成一对一同步

10
wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pm_manage/form_data/service/impl/PmFormDataServiceImpl.java
View File

@@ -156,11 +156,13 @@ public class PmFormDataServiceImpl extends ServiceImpl<PmFormDataMapper, PmFormD
}
@Override
public List<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
// Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
// page.setOrderBy("id DESC");
public com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> queryTree(FormDataQuery query, PageQuery pageQuery) {
Page page = PageHelper.startPage(pageQuery.getPage() + 1, pageQuery.getSize());
page.setOrderBy("id DESC");
List<PmFormDataDto> pmFormDataDtos = this.baseMapper.queryTree(query);
return pmFormDataDtos;
com.baomidou.mybatisplus.extension.plugins.pagination.Page<PmFormDataDto> dtoPage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page.getPages(), page.getPageSize(), page.getTotal());
dtoPage.setRecords(pmFormDataDtos);
return dtoPage;
}