Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 3db93805 由 张少辉
选项

1.自动推送odn切到正式环境 

2.推送记录增加已取消和库别
1 个父辈 a15294d5
内嵌 并排
正在显示 7 个修改的文件 包含 27 行增加 和 3 行删除
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/bean/AutoStoOdn.java
...@@ -16,5 +16,5 @@ public class AutoStoOdn extends BasePo { ...@@ -16,5 +16,5 @@ public class AutoStoOdn extends BasePo {
private String sto; private String sto;
private String odn; private String odn;
private String warehouse = "W101"; private String warehouse = "W101";
private int status = 0; //0:未开始 1:正在执行中 2:已完成 private int status = 0; //0:未开始 1:正在执行中 2:已完成 3:已取消
} }
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AutoDispatchInfoController.java
...@@ -6,12 +6,15 @@ import com.neotel.smfcore.common.utils.DateUtil; ...@@ -6,12 +6,15 @@ import com.neotel.smfcore.common.utils.DateUtil;
import com.neotel.smfcore.common.utils.StringUtils; import com.neotel.smfcore.common.utils.StringUtils;
import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager; import com.neotel.smfcore.core.barcode.service.manager.IBarcodeManager;
import com.neotel.smfcore.core.barcode.service.po.Barcode; import com.neotel.smfcore.core.barcode.service.po.Barcode;
import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
import com.neotel.smfcore.core.order.service.po.LiteOrder;
import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager; 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.custom.luxsan.api.LuxsanApi; import com.neotel.smfcore.custom.luxsan.api.LuxsanApi;
import com.neotel.smfcore.custom.luxsan.api.bean.request.AutoStoRequest; import com.neotel.smfcore.custom.luxsan.api.bean.request.AutoStoRequest;
import com.neotel.smfcore.custom.luxsan.api.bean.result.AutoStoResult; import com.neotel.smfcore.custom.luxsan.api.bean.result.AutoStoResult;
import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil; import com.neotel.smfcore.custom.luxsan.factory_c.common.util.CommonUtil;
import com.neotel.smfcore.custom.luxsan.factory_c.wipstor.service.manager.IAutoStoOdnManager;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
...@@ -40,6 +43,9 @@ public class AutoDispatchInfoController { ...@@ -40,6 +43,9 @@ public class AutoDispatchInfoController {
@Autowired @Autowired
private IBarcodeManager barcodeManager; private IBarcodeManager barcodeManager;
@Autowired
private IAutoStoOdnManager autoStoOdnManager;
@ApiOperation("手动解除绑定信息") @ApiOperation("手动解除绑定信息")
@RequestMapping("/removeBindOdn") @RequestMapping("/removeBindOdn")
@AnonymousAccess @AnonymousAccess
...@@ -49,12 +55,22 @@ public class AutoDispatchInfoController { ...@@ -49,12 +55,22 @@ public class AutoDispatchInfoController {
if (pos != null) { if (pos != null) {
Barcode barcode = pos.getBarcode(); Barcode barcode = pos.getBarcode();
if (barcode != null){ if (barcode != null){
String odn = barcode.getOdn();
barcode.setCurrentRequestId(""); barcode.setCurrentRequestId("");
barcode.setOdn(""); barcode.setOdn("");
barcode.setSto(""); barcode.setSto("");
barcodeManager.save(barcode); barcodeManager.save(barcode);
pos.setBarcode(barcode); pos.setBarcode(barcode);
storagePosManager.save(pos); storagePosManager.save(pos);
//同时更新autoStoOdn信息
if (StringUtils.isNotEmpty(odn)){
LiteOrder liteOrder = new LiteOrder();
liteOrder.setOrderNo(odn);
liteOrder.setStatus(LITEORDER_STATUS.PAUSE);
autoStoOdnManager.updateOdnStatus(liteOrder, LITEORDER_STATUS.PAUSE);
}
} }
} }
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AutoDispatchInventoryController.java
...@@ -236,6 +236,7 @@ public class AutoDispatchInventoryController { ...@@ -236,6 +236,7 @@ public class AutoDispatchInventoryController {
autoStoOdn.setModel(autoStoRequest.getModel()); autoStoOdn.setModel(autoStoRequest.getModel());
autoStoOdn.setSto(autoStoResult.getDETAIL()); autoStoOdn.setSto(autoStoResult.getDETAIL());
autoStoOdn.setOdn(autoStoResult.getDATA()); autoStoOdn.setOdn(autoStoResult.getDATA());
autoStoOdn.setWarehouse(autoStoRequest.getWarehouse_code());
autoStoOdnManager.save(autoStoOdn); autoStoOdnManager.save(autoStoOdn);
log.info("【自动出库】保存ODN记录成功：{}", JSON.toJSONString(autoStoOdn)); log.info("【自动出库】保存ODN记录成功：{}", JSON.toJSONString(autoStoOdn));
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/AutoStoOdnController.java
...@@ -86,6 +86,8 @@ public class AutoStoOdnController { ...@@ -86,6 +86,8 @@ public class AutoStoOdnController {
data.add("正在执行"); data.add("正在执行");
} else if (autoStoOdn.getStatus() == 2){ } else if (autoStoOdn.getStatus() == 2){
data.add("已完成"); data.add("已完成");
} else if (autoStoOdn.getStatus() == 3){
data.add("已取消");
} }
dataList.add(data); dataList.add(data);
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/controller/PnPriorityMtController.java
...@@ -170,7 +170,10 @@ public class PnPriorityMtController { ...@@ -170,7 +170,10 @@ public class PnPriorityMtController {
return ResultBean.newErrorResult(-1,"","请检查是否有空值或者出库数量和优先级不是数字"); return ResultBean.newErrorResult(-1,"","请检查是否有空值或者出库数量和优先级不是数字");
} }
for (PnPriorityMt pnPriorityMt : pnPriorityMtList) { for (PnPriorityMt pnPriorityMt : pnPriorityMtList) {
PnPriorityMt mt = pnPriorityMtManager.findOne(new Query(Criteria.where("partNumber").is(pnPriorityMt.getPartNumber()).and("modelFamily").is(pnPriorityMt.getModelFamily()))); PnPriorityMt mt = pnPriorityMtManager.findOne(new Query(Criteria.where("partNumber").is(pnPriorityMt.getPartNumber())
.and("modelFamily").is(pnPriorityMt.getModelFamily())
.and("warehouse").is(pnPriorityMt.getWarehouse()))
);
if (mt != null){ if (mt != null){
pnPriorityMt.setId(mt.getId()); pnPriorityMt.setId(mt.getId());
pnPriorityMt.setCreateDate(mt.getCreateDate()); pnPriorityMt.setCreateDate(mt.getCreateDate());
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/wipstor/service/manager/impl/AutoStoOdnManagerImpl.java
...@@ -64,6 +64,8 @@ public class AutoStoOdnManagerImpl implements IAutoStoOdnManager { ...@@ -64,6 +64,8 @@ public class AutoStoOdnManagerImpl implements IAutoStoOdnManager {
autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 1)); autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 1));
} else if (order.isClosed()){ } else if (order.isClosed()){
autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 2)); autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 2));
} else if (order.getStatus() == LITEORDER_STATUS.PAUSE){
autoStoOdnDao.updateFirst(new Query(Criteria.where("odn").is(order.getOrderNo())), Update.update("status", 3));
} }
}catch (Exception e){ }catch (Exception e){
log.error(e.getMessage()); log.error(e.getMessage());
......
src/main/resources/config/application-21088prod.yml
...@@ -189,4 +189,4 @@ api: ...@@ -189,4 +189,4 @@ api:
ticketGbPost: http://10.68.30.22:8082/api/mlb/TicketGbPost ticketGbPost: http://10.68.30.22:8082/api/mlb/TicketGbPost
#自动抛送信息,生成odn #自动抛送信息,生成odn
autoSto: http://10.42.220.171:8082/api/mlb/AutoSto autoSto: http://10.68.30.22:8082/api/mlb/AutoSto
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!