Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 70a19b7d 由 LN
选项

工单出库暂不更改条码数量。增加屏蔽库位接口。

1 个父辈 6175b16c
内嵌 并排
正在显示 3 个修改的文件 包含 52 行增加 和 21 行删除
src/main/java/com/neotel/smfcore/core/device/rest/DeviceController.java
package com.neotel.smfcore.core.device.rest; package com.neotel.smfcore.core.device.rest;
import cn.hutool.core.util.ObjectUtil;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
...@@ -11,6 +12,8 @@ import com.neotel.smfcore.common.utils.Constants; ...@@ -11,6 +12,8 @@ import com.neotel.smfcore.common.utils.Constants;
import com.neotel.smfcore.common.utils.ReelLockPosUtil; import com.neotel.smfcore.common.utils.ReelLockPosUtil;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.barcode.utils.CodeResolve; import com.neotel.smfcore.core.barcode.utils.CodeResolve;
import com.neotel.smfcore.core.storage.service.dao.IStoragePosDao;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
import com.neotel.smfcore.core.storage.service.po.StoragePos; import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao; import com.neotel.smfcore.core.system.service.dao.IAlarmInfoDao;
import com.neotel.smfcore.core.system.service.po.AlarmInfo; import com.neotel.smfcore.core.system.service.po.AlarmInfo;
...@@ -49,6 +52,9 @@ public class DeviceController { ...@@ -49,6 +52,9 @@ public class DeviceController {
@Autowired @Autowired
private CodeResolve codeResolve; private CodeResolve codeResolve;
@Autowired
private IStoragePosManager storagePosManager;
private Map<String, IDeviceHandler> handlerMap = new HashMap<>(); private Map<String, IDeviceHandler> handlerMap = new HashMap<>();
public DeviceController(List<IDeviceHandler> deviceHandlerList) { public DeviceController(List<IDeviceHandler> deviceHandlerList) {
...@@ -356,4 +362,29 @@ public class DeviceController { ...@@ -356,4 +362,29 @@ public class DeviceController {
return ResultBean.newErrorResult(2005, "smfcore.cancelOutTask.fail","客户端取消入库任务[{0}]失败:{1}", new String[]{codeStr,""}); return ResultBean.newErrorResult(2005, "smfcore.cancelOutTask.fail","客户端取消入库任务[{0}]失败:{1}", new String[]{codeStr,""});
} }
@ApiOperation("屏蔽库位")
@RequestMapping(value = "/service/store/disabledPos")
@ResponseBody
@AnonymousAccess
public ResultBean disabledPos(HttpServletRequest request) {
String posId = request.getParameter("posId");
String barcode = request.getParameter("barcode");
if (ObjectUtil.isEmpty(posId)) {
return ResultBean.newErrorResult(1, "smfcore.valueCanotNull", "{0}不能为空", new String[]{"posId"});
}
if (ObjectUtil.isEmpty(barcode)) {
barcode = "";
}
StoragePos pos = storagePosManager.getByPosName(posId);
if (pos == null) {
return ResultBean.newErrorResult(1, "smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", posId});
}
pos.setEnabled(true);
storagePosManager.save(pos);
log.info("屏蔽库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]barcode[" + barcode + "]");
return ResultBean.newOkResult("");
}
} }
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -237,21 +237,21 @@ public class LiteOrderCache implements ITaskListener { ...@@ -237,21 +237,21 @@ public class LiteOrderCache implements ITaskListener {
liteOrderItem.setTotalOutNum(liteOrderItem.getTotalOutNum()+task.getNum()); liteOrderItem.setTotalOutNum(liteOrderItem.getTotalOutNum()+task.getNum());
liteOrderItem.setTotalOutReelCount(liteOrderItem.getTotalOutReelCount()+1); liteOrderItem.setTotalOutReelCount(liteOrderItem.getTotalOutReelCount()+1);
liteOrderItem = liteOrderItemManager.save(liteOrderItem); liteOrderItem = liteOrderItemManager.save(liteOrderItem);
Barcode barcode = barcodeManager.findByBarcode(task.getBarcode()); // Barcode barcode = barcodeManager.findByBarcode(task.getBarcode());
if (barcode != null) { // if (barcode != null) {
Float totalNeedNum = liteOrderItem.getNeedNum() * order.getOrderTimes(); // Float totalNeedNum = liteOrderItem.getNeedNum() * order.getOrderTimes();
int barcodeRemainNum = liteOrderItem.getOutNum() - totalNeedNum.intValue(); // int barcodeRemainNum = liteOrderItem.getOutNum() - totalNeedNum.intValue();
if (barcodeRemainNum < 0) { // if (barcodeRemainNum < 0) {
barcodeRemainNum = 0; // barcodeRemainNum = 0;
} // }
barcode.setAmount(barcodeRemainNum); // barcode.setAmount(barcodeRemainNum);
log.info("条码[" + task.getBarcode() + "]从工单出库,更改数量为:" + barcodeRemainNum); // log.info("条码[" + task.getBarcode() + "]从工单出库,更改数量为:" + barcodeRemainNum);
try { // try {
barcodeManager.save(barcode); // barcodeManager.save(barcode);
} catch (ValidateException e) { // } catch (ValidateException e) {
e.printStackTrace(); // e.printStackTrace();
} // }
} // }
} }
items.add(liteOrderItem); items.add(liteOrderItem);
} }
......
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -65,8 +65,8 @@ public class StoragePosController { ...@@ -65,8 +65,8 @@ public class StoragePosController {
@Autowired @Autowired
private final IStoragePosManager storagePosManager; private final IStoragePosManager storagePosManager;
@Autowired // @Autowired
private final IStoragePosDao storagePosDao; // private final IStoragePosDao storagePosDao;
@Autowired @Autowired
private final StoragePosMapper storagePosMapper; private final StoragePosMapper storagePosMapper;
@Autowired @Autowired
...@@ -207,13 +207,13 @@ public class StoragePosController { ...@@ -207,13 +207,13 @@ public class StoragePosController {
if (enabledDto.getId() == null) { if (enabledDto.getId() == null) {
throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"ID"}); throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"ID"});
} }
StoragePos pos = storagePosDao.findOneById(enabledDto.getId()); StoragePos pos = storagePosManager.get(enabledDto.getId());
if (pos == null) { if (pos == null) {
throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", enabledDto.getId()}); throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", enabledDto.getId()});
// throw new ValidateException("未找到库位 "); // throw new ValidateException("未找到库位 ");
} }
pos.setEnabled(enabledDto.isEnabled()); pos.setEnabled(enabledDto.isEnabled());
storagePosDao.save(pos); storagePosManager.save(pos);
log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled()); log.info("启用禁用库位:库位号[" + pos.getId() + "][" + pos.getPosName() + "]=" + enabledDto.isEnabled());
return ResultBean.newOkResult(""); return ResultBean.newOkResult("");
...@@ -230,7 +230,7 @@ public class StoragePosController { ...@@ -230,7 +230,7 @@ public class StoragePosController {
if (saveDto.getPosName() == null) { if (saveDto.getPosName() == null) {
throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"ID"}); throw new ValidateException("smfcore.valueCanotNull", "{0}不能为空", new String[]{"ID"});
} }
StoragePos pos = storagePosDao.findOneById(saveDto.getId()); StoragePos pos = storagePosManager.get(saveDto.getId());
if (pos == null) { if (pos == null) {
throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", saveDto.getId()}); throw new ValidateException("smfcore.valueNotFind", "未找到{0}[{1}]", new String[]{"PosId", saveDto.getId()});
// throw new ValidateException("未找到库位 "); // throw new ValidateException("未找到库位 ");
...@@ -239,7 +239,7 @@ public class StoragePosController { ...@@ -239,7 +239,7 @@ public class StoragePosController {
pos.setPriority(saveDto.getPriority()); pos.setPriority(saveDto.getPriority());
pos.setH(saveDto.getH()); pos.setH(saveDto.getH());
pos.setW(saveDto.getW()); pos.setW(saveDto.getW());
storagePosDao.save(pos); storagePosManager.save(pos);
log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]"); log.info("修改库位:库位号[" + pos.getId() + "]=[" + saveDto.toString() + "]");
return new ResponseEntity<>(HttpStatus.OK); return new ResponseEntity<>(HttpStatus.OK);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!