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

缓存线pad接口更新

Browse Source
This commit is contained in:
baoge
2023-03-24 17:46:05 +08:00
parent e92fefadb1
commit afdbe51b09
4 changed files with 892 additions and 695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mes/hd/nladmin-system/src/main/java/org/nl/common/utils/api/RestBusinessTemplate.java
View File

@@ -41,7 +41,7 @@ public class RestBusinessTemplate{
catch(Exception e) {
log.error("execute error", e);
result.setCode(ResultCode.FAILED.getCode());
result.setDesc(ResultCode.FAILED.getDesc());
result.setDesc(ResultCode.FAILED.getDesc()+",原因是:"+e.getMessage());
}
return result;
}

183
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/rest/CacheLineHandController.java
View File

@@ -1,6 +1,7 @@
package org.nl.wms.pda.rest;
import cn.dev33.satoken.annotation.SaIgnore;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -12,6 +13,7 @@ import org.nl.common.utils.api.CommonResult;
import org.nl.common.utils.api.RestBusinessTemplate;
import org.nl.common.utils.api.ResultCode;
import org.nl.modules.common.exception.BizCoreException;
import org.nl.wms.pda.dto.MaterialDto;
import org.nl.wms.pda.service.CacheLineHandService;
import org.springframework.data.domain.Pageable;
import org.springframework.web.bind.annotation.PostMapping;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
import java.util.Map;
/**
@@ -39,7 +42,7 @@ public class CacheLineHandController{
@PostMapping("/materialQuery")
@Log("物料查询")
@ApiOperation("物料查询")
public CommonResult<Object> materialQuery(@RequestBody JSONObject form) {
public CommonResult<List<MaterialDto>> materialQuery(@RequestBody JSONObject form) {
log.info("海亮缓存线手持服务 [查询物料] 接口被请求, 请求参数-{}", form);
return RestBusinessTemplate.execute(() -> cacheLineHandService.materialQuery(form.getString("search_bar")));
}
@@ -47,7 +50,7 @@ public class CacheLineHandController{
@PostMapping("/semiMaterialSpecQuery")
@Log("规格下拉框查询")
@ApiOperation("规格下拉框查询")
public CommonResult<Object> semiMaterialSpecQuery(@RequestBody JSONObject form) {
public CommonResult<JSONArray> semiMaterialSpecQuery(@RequestBody JSONObject form) {
log.info("海亮缓存线手持服务 [规格下拉框查询] 接口被请求, 请求参数-{}", form);
return RestBusinessTemplate.execute(() -> cacheLineHandService.semiMaterialSpecQuery(form.getString("form")));
}
@@ -55,7 +58,7 @@ public class CacheLineHandController{
@PostMapping("/workProcedureQuery")
@Log("工序下拉框查询")
@ApiOperation("工序下拉框查询")
public CommonResult<Object> workProcedureQuery(@RequestBody JSONObject form) {
public CommonResult<JSONArray> workProcedureQuery(@RequestBody JSONObject form) {
log.info("海亮缓存线手持服务 [工序下拉框查询] 接口被请求, 请求参数-{}", form);
return RestBusinessTemplate.execute(() -> cacheLineHandService.workProcedureQuery(form.getString("form")));
}
@@ -63,7 +66,7 @@ public class CacheLineHandController{
@PostMapping("/deviceQuery")
@Log("缓存线设备下拉框查询")
@ApiOperation("缓存线设备下拉框查询")
public CommonResult<Object> deviceQuery(@RequestBody JSONObject form) {
public CommonResult<JSONArray> deviceQuery(@RequestBody JSONObject form) {
log.info("海亮缓存线手持服务 [缓存线设备下拉框查询] 接口被请求, 请求参数-{}", form);
return RestBusinessTemplate.execute(() -> cacheLineHandService.deviceQuery(form.getString("form")));
}
@@ -71,7 +74,7 @@ public class CacheLineHandController{
@PostMapping("/instStatusQuery")
@Log("指令状态下拉框查询")
@ApiOperation("指令状态下拉框查询")
public CommonResult<Object> instStatusQuery(@RequestBody JSONObject form) {
public CommonResult<JSONArray> instStatusQuery(@RequestBody JSONObject form) {
log.info("海亮缓存线手持服务 [指令状态下拉框查询] 接口被请求, 请求参数-{}", form);
return RestBusinessTemplate.execute(() -> cacheLineHandService.instStatusQuery(form.getString("form")));
}
@@ -92,7 +95,7 @@ public class CacheLineHandController{
@PostMapping("/cacheLineMaterCheck")
@Log("缓存线物料盘点")
@ApiOperation("缓存线物料盘点")
public CommonResult<Object> cacheLineMaterCheck(@RequestBody JSONObject param) {
public CommonResult<JSONArray> cacheLineMaterCheck(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线物料盘点] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(cacheLineHandService::cacheLineMaterCheck);
}
@@ -110,4 +113,172 @@ public class CacheLineHandController{
cacheLineHandService.instOperation(param);
});
}
@PostMapping("/cacheLineMaterInfoQuery")
@Log("缓存线料箱条码查询料箱信息")
@ApiOperation("缓存线料箱条码查询料箱信息")
public CommonResult<JSONArray> cacheLineMaterInfoQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线料箱条码查询料箱信息] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.cacheLineMaterInfoQuery(param));
}
@PostMapping("/inOutEmptyBox")
@Log("空箱初始化--出入空箱")
@ApiOperation("空箱初始化--出入空箱")
public CommonResult<Void> inOutEmptyBox(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [空箱初始化--出入空箱] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.inOutEmptyBox(param);
});
}
@PostMapping("/inOutExceptionInstQuery")
@Log("缓存线出入箱异常指令查询")
@ApiOperation("缓存线出入箱异常指令查询")
public CommonResult<JSONArray> inOutExceptionInstQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出入箱异常指令查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.inOutExceptionInstQuery(param));
}
@PostMapping("/inOutExceptionInstConfirm")
@Log("缓存线出入箱异常指令确认")
@ApiOperation("缓存线出入箱异常指令确认")
public CommonResult<Void> inOutExceptionInstConfirm(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出入箱异常指令确认] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.inOutExceptionInstConfirm(param);
});
}
@PostMapping("/setfullBox")
@Log("设置满框")
@ApiOperation("设置满框")
public CommonResult<Void> setfullBox(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [设置满框] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.setfullBox(param);
});
}
@PostMapping("/setEmptyBox")
@Log("设置空框")
@ApiOperation("设置空框")
public CommonResult<Void> setEmptyBox(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [设置空框] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.setEmptyBox(param);
});
}
@PostMapping("/agvInBoxExceptionQuery")
@Log("AGV入箱异常-查询")
@ApiOperation("AGV入箱异常-查询")
public CommonResult<JSONArray> agvInBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV入箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.agvInBoxExceptionQuery(param));
}
@PostMapping("/agvInBoxExceptionConfirm")
@Log("AGV入箱异常-确认")
@ApiOperation("AGV入箱异常-确认")
public CommonResult<Void> agvInBoxExceptionConfirm(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV入箱异常-确认] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.agvInBoxExceptionConfirm(param);
});
}
@PostMapping("/agvOutBoxExceptionQuery")
@Log("AGV出箱异常-查询")
@ApiOperation("AGV出箱异常-查询")
public CommonResult<JSONArray> agvOutBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV出箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.agvOutBoxExceptionQuery(param));
}
@PostMapping("/agvOutBoxExceptionConfirm")
@Log("AGV出箱异常-确认")
@ApiOperation("AGV出箱异常-确认")
public CommonResult<Void> agvOutBoxExceptionConfirm(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [AGV出箱异常-确认] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.agvOutBoxExceptionConfirm(param);
});
}
@PostMapping("/cacheLineOutBoxExceptionConfirm")
@Log("缓存线出箱异常-确认")
@ApiOperation("缓存线出箱异常-确认")
public CommonResult<Void> cacheLineOutBoxExceptionConfirm(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出箱异常-确认] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.cacheLineOutBoxExceptionConfirm(param);
});
}
@PostMapping("/setBlankPos")
@Log("设置缓存线货位为空位置")
@ApiOperation("设置缓存线货位为空位置")
public CommonResult<Void> setBlankPos(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [设置缓存线货位为空位置] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.setBlankPos(param);
});
}
@PostMapping("/cacheLineOutBoxExceptionQuery")
@Log("缓存线出箱异常-查询")
@ApiOperation("缓存线出箱异常-查询")
public CommonResult<JSONArray> cacheLineOutBoxExceptionQuery(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线出箱异常-查询] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(()-> cacheLineHandService.cacheLineOutBoxExceptionQuery(param));
}
@PostMapping("/cacheLineExcepOpt")
@Log("缓存线异常处理")
@ApiOperation("缓存线异常处理")
public CommonResult<Void> cacheLineExcepOpt(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [缓存线异常处理] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.cacheLineExcepOpt(param);
});
}
@PostMapping("/pourMaterial")
@Log("倒料操作")
@ApiOperation("倒料操作")
public CommonResult<Void> pourMaterial(@RequestBody JSONObject param) {
log.info("海亮缓存线手持服务 [倒料操作] 接口被请求, 请求参数-{}", param);
return RestBusinessTemplate.execute(() -> {
cacheLineHandService.pourMaterial(param);
});
}
}

99
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/CacheLineHandService.java
View File

@@ -101,174 +101,143 @@ public interface CacheLineHandService{
* @author gbx
* @date 2023/3/24
*/
Object cacheLineMaterCheck();
JSONArray cacheLineMaterCheck();
/**
* 缓存线料箱条码查询料箱信息
*
* @param param
* @return
* @param param 请求参数
* @return 返回结果
* @author gbx
* @date 2023/3/24
*/
Object cachelineMaterInfoQuery(JSONObject param);
JSONArray cacheLineMaterInfoQuery(JSONObject param);
/**
* 空箱初始化--出入空箱
*
* @param param 查询参数 inOut_type:1 入空箱 2 出空箱 vehicle_code:载具编码
* @return
* @author gbx
* @date 2023/3/24
*/
Object inOutEmptyBox(JSONObject param);
void inOutEmptyBox(JSONObject param);
/**
* 缓存线出入箱异常指令查询
*
* @param param 查询参数 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码
* @return
* @return 返回结果集
* @author gbx
* @date 2023/3/24
*/
Object inOutExceptionInstQuery(JSONObject param);
JSONArray inOutExceptionInstQuery(JSONObject param);
/**
* 缓存线出入箱异常指令确认
*
* @param param 查询参数 1 扫码异常-入箱扫码 2 扫码异常-出箱扫码
* @return
* @author gbx
* @date 2023/3/24
*/
Object inOutExceptionInstConfirm(JSONObject param);
void inOutExceptionInstConfirm(JSONObject param);
/**
* 设置满匡
* 设置满框
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object setfullBox(JSONObject param);
void setfullBox(JSONObject param);
/**
* 设置空框
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object setEmptyBox(JSONObject param);
void setEmptyBox(JSONObject param);
/**
* AGV入箱异常-查询
*
* @param param
* @return
* @param param 查询参数
* @return 返回结果集
* @author gbx
* @date 2023/3/24
*/
Object agvInBoxExceptionQuery(JSONObject param);
JSONArray agvInBoxExceptionQuery(JSONObject param);
/**
* AGV入箱异常-确认
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object agvInBoxExceptionConfirm(JSONObject param);
void agvInBoxExceptionConfirm(JSONObject param);
/**
* AGV出箱异常-查询
*
* @param param
* @return
* @param param 查询参数
* @return 返回结果集
* @author gbx
* @date 2023/3/24
*/
Object agvOutBoxExceptionQuery(JSONObject param);
JSONArray agvOutBoxExceptionQuery(JSONObject param);
/**
* AGV出箱异常-确认
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object agvOutBoxExceptionConfirm(JSONObject param);
/**
* 缓存线出箱异常-查询
*
* @param param
* @return
* @author gbx
* @date 2023/3/24
*/
Object cacheLineOutBoxExceptionQuery(String account_uuid, JSONObject param);
void agvOutBoxExceptionConfirm(JSONObject param);
/**
* 缓存线出箱异常-确认
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object cacheLineOutBoxExceptionConfirm(
String account_uuid, JSONObject param);
void cacheLineOutBoxExceptionConfirm(JSONObject param);
/**
* 设置缓存线货位为空位置
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object setBlankPos(JSONObject param);
void setBlankPos(JSONObject param);
/**
* @param param
* @return
* @param param 查询参数
* @return 返回结果集
* @author gbx
* @date 2023/3/24
*/
Object cacheLineOutBoxExceptionQuery(
JSONObject param);
/**
* @param param
* @return
* @author gbx
* @date 2023/3/24
*/
Object cacheLineOutBoxExceptionConfirm(
JSONObject param);
JSONArray cacheLineOutBoxExceptionQuery(JSONObject param);
/**
* 缓存线异常处理
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object cacheLineExcepOpt(JSONObject param);
void cacheLineExcepOpt(JSONObject param);
/**
* 倒料操作
*
* @param param
* @return
* @param param 查询参数
* @author gbx
* @date 2023/3/24
*/
Object pourMaterial(JSONObject param);
void pourMaterial(JSONObject param);
}

1281
mes/hd/nladmin-system/src/main/java/org/nl/wms/pda/service/impl/CacheLineHandServiceImpl.java
View File

File diff suppressed because it is too large Load Diff