Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f2cf9aed 由 zshaohui
选项

功能优化

1 个父辈 a5a90284
内嵌 并排
正在显示 5 个修改的文件 包含 21 行增加 和 8 行删除
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -509,7 +509,7 @@ public class StoragePosController { ...@@ -509,7 +509,7 @@ public class StoragePosController {
String box = criteria.getBox(); String box = criteria.getBox();
String partNumber = criteria.getPartNumber(); String partNumber = criteria.getPartNumber();
if (StringUtils.isBlank(stationName)) { if (StringUtils.isBlank(stationName)) {
return ResultBean.newErrorResult(-1, "", "请选择对应的工位"); return ResultBean.newErrorResult(-1, "", "请选择对应的位置");
} }
if (StringUtils.isBlank(partNumber) if (StringUtils.isBlank(partNumber)
&& StringUtils.isBlank(provider) && StringUtils.isBlank(provider)
...@@ -587,8 +587,11 @@ public class StoragePosController { ...@@ -587,8 +587,11 @@ public class StoragePosController {
//保存信息 //保存信息
barcode = barcodeManager.save(barcode); barcode = barcodeManager.save(barcode);
pidBarcode.UpdateSubCode(barcode); pidBarcode.UpdateSubCode(barcode);
barcodeManager.saveBarcode(pidBarcode);
} }
barcodeManager.saveBarcode(pidBarcode);
pos.setBarcode(pidBarcode);
storagePosManager.save(pos);
} }
if (hasOutReel) { if (hasOutReel) {
......
src/main/java/com/neotel/smfcore/core/system/rest/TaskController.java
...@@ -115,6 +115,7 @@ public class TaskController { ...@@ -115,6 +115,7 @@ public class TaskController {
headerList.add(Lists.newArrayList("类型")); headerList.add(Lists.newArrayList("类型"));
headerList.add(Lists.newArrayList("来源")); headerList.add(Lists.newArrayList("来源"));
headerList.add(Lists.newArrayList("状态")); headerList.add(Lists.newArrayList("状态"));
headerList.add(Lists.newArrayList("当前位置"));
headerList.add(Lists.newArrayList("操作人")); headerList.add(Lists.newArrayList("操作人"));
headerList.add(Lists.newArrayList("创建时间")); headerList.add(Lists.newArrayList("创建时间"));
headerList.add(Lists.newArrayList("更新时间")); headerList.add(Lists.newArrayList("更新时间"));
...@@ -134,6 +135,7 @@ public class TaskController { ...@@ -134,6 +135,7 @@ public class TaskController {
result.add(dataLog.getType() == 1 ? "入库" : "出库"); result.add(dataLog.getType() == 1 ? "入库" : "出库");
result.add(dataLog.getSourceName()); result.add(dataLog.getSourceName());
result.add(dataLog.getStatus()); result.add(dataLog.getStatus());
result.add(dataLog.getCurrentLoc());
result.add(dataLog.getCreator()); result.add(dataLog.getCreator());
result.add(dataLog.getCreateDate()); result.add(dataLog.getCreateDate());
result.add(dataLog.getUpdateDate()); result.add(dataLog.getUpdateDate());
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java
...@@ -146,6 +146,9 @@ public class TaskDto implements Serializable { ...@@ -146,6 +146,9 @@ public class TaskDto implements Serializable {
@ApiModelProperty("出口位置") @ApiModelProperty("出口位置")
private String export = ""; private String export = "";
@ApiModelProperty("当前位置")
private String currentLoc = "";
public String getTaskColor() { public String getTaskColor() {
if (ObjectUtil.isNotEmpty(lightColor)) { if (ObjectUtil.isNotEmpty(lightColor)) {
return "#" + lightColor; return "#" + lightColor;
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -642,10 +642,10 @@ public class CDeviceController { ...@@ -642,10 +642,10 @@ public class CDeviceController {
@ApiOperation("呼叫空箱") @ApiOperation("呼叫空箱")
@RequestMapping("/callEmptyBox") @RequestMapping("/callEmptyBox")
@AnonymousAccess @AnonymousAccess
public ResultBean callEmptyBox(String size, String outLet, String wareHouseCode) { public ResultBean callEmptyBox(String size, String outLet, String warehouseCode) {
log.info("开始呼叫空箱,尺寸为:" + size + ",出口位置为:" + outLet); log.info("开始呼叫空箱,尺寸为:" + size + ",出口位置为:" + outLet+",库别为:"+warehouseCode);
StoragePos storagePos = BoxHandleUtil.callEmptyBox(size, outLet, wareHouseCode,new ArrayList<>()); StoragePos storagePos = BoxHandleUtil.callEmptyBox(size, outLet, warehouseCode,new ArrayList<>());
if (storagePos == null) { if (storagePos == null) {
return ResultBean.newErrorResult(-1, "", "未找到可用料箱"); return ResultBean.newErrorResult(-1, "", "未找到可用料箱");
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/StorTransferController.java
...@@ -47,16 +47,16 @@ public class StorTransferController { ...@@ -47,16 +47,16 @@ public class StorTransferController {
log.info("储位移转信息为:" + JSON.toJSONString(paramMap)); log.info("储位移转信息为:" + JSON.toJSONString(paramMap));
String materialStr = paramMap.get("materialStr"); String materialStr = paramMap.get("materialStr");
String warehouseCode = paramMap.get("warehouseCode"); //String warehouseCode = paramMap.get("warehouseCode");
String codeStr = paramMap.get("codeStr"); String codeStr = paramMap.get("codeStr");
if (StringUtils.isEmpty(materialStr)) { if (StringUtils.isEmpty(materialStr)) {
return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"}); return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"料串信息"});
} }
if (StringUtils.isEmpty(warehouseCode)) { /*if (StringUtils.isEmpty(warehouseCode)) {
return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"库别信息"}); return ResultBean.newErrorResult(-1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"库别信息"});
} }*/
//判断料串信息是否正确 //判断料串信息是否正确
if (StringUtils.isEmpty(materialStr) || !materialStr.startsWith("B00")) { if (StringUtils.isEmpty(materialStr) || !materialStr.startsWith("B00")) {
...@@ -74,6 +74,11 @@ public class StorTransferController { ...@@ -74,6 +74,11 @@ public class StorTransferController {
return ResultBean.newErrorResult(-1, "smfcore.error.barcode.noValidCode", "条码无效"); return ResultBean.newErrorResult(-1, "smfcore.error.barcode.noValidCode", "条码无效");
} }
String warehouseCode = barcode.getWarehouseCode();
if (StringUtils.isEmpty(warehouseCode)) {
return ResultBean.newErrorResult(-1, "", "未找到"+barcode.getBarcode()+"的库别信息");
}
//获取尺寸信息 //获取尺寸信息
BrandQtyResult result = LuxsanApi.brandQtyUrl(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider())); BrandQtyResult result = LuxsanApi.brandQtyUrl(new BrandQtyRequest(barcode.getPartNumber(), barcode.getProvider()));
if (result == null) { if (result == null) {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!