Skip to content

孙克 / smf-core

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

Merge remote-tracking branch 'origin/master'

2 个父辈 6803846d e62df9ab
内嵌 并排
正在显示 3 个修改的文件 包含 35 行增加 和 1 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -496,6 +496,7 @@ public class LiteOrderCache { ...@@ -496,6 +496,7 @@ public class LiteOrderCache {
} }
List<String> availableStorageIds = dataCache.getAvailableStorageIds(cidList); List<String> availableStorageIds = dataCache.getAvailableStorageIds(cidList);
boolean shortage=false;
//其他出库模式一次性全部生成任务 //其他出库模式一次性全部生成任务
for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) { for (LiteOrderItem orderItem : cacheOrder.getOrderItems()) {
orderItem.setOutNum(0); orderItem.setOutNum(0);
...@@ -533,6 +534,7 @@ public class LiteOrderCache { ...@@ -533,6 +534,7 @@ public class LiteOrderCache {
break; break;
} }
}else{ }else{
shortage=true;
log.info("工单[" + orderNo + "]RI出库时,库存中未找到料盘["+reelId+"]"); log.info("工单[" + orderNo + "]RI出库时,库存中未找到料盘["+reelId+"]");
} }
}else if (Strings.isNullOrEmpty(reelId) && !Strings.isNullOrEmpty(partNumber)){ }else if (Strings.isNullOrEmpty(reelId) && !Strings.isNullOrEmpty(partNumber)){
...@@ -543,6 +545,7 @@ public class LiteOrderCache { ...@@ -543,6 +545,7 @@ public class LiteOrderCache {
} }
if (pos == null) { if (pos == null) {
// log.error("未找到可以出库的物料[" + partNumber + "]"); // log.error("未找到可以出库的物料[" + partNumber + "]");
shortage=true;
break; break;
} else { } else {
assignNum = assignNum + pos.getBarcode().getAmount(); assignNum = assignNum + pos.getBarcode().getAmount();
...@@ -572,6 +575,11 @@ public class LiteOrderCache { ...@@ -572,6 +575,11 @@ public class LiteOrderCache {
} }
if(shortage){
cacheOrder.addAppendDate("shortage","true");
}else{
cacheOrder.addAppendDate("shortage","false");
}
cacheOrder.setTaskReelCount(taskReelCount); cacheOrder.setTaskReelCount(taskReelCount);
cacheOrder.setTotalTaskReelCount(cacheOrder.getTotalTaskReelCount()+taskReelCount); cacheOrder.setTotalTaskReelCount(cacheOrder.getTotalTaskReelCount()+taskReelCount);
log.info("工单[" + orderNo + "]任务分配结束,任务数[" + taskReelCount + "]"); log.info("工单[" + orderNo + "]任务分配结束,任务数[" + taskReelCount + "]");
...@@ -679,6 +687,7 @@ public class LiteOrderCache { ...@@ -679,6 +687,7 @@ public class LiteOrderCache {
} }
if(shortReel){ if(shortReel){
cacheOrder.addAppendDate("shortage","true");
cacheOrder.setClosed(true); cacheOrder.setClosed(true);
cacheOrder.setStatus(LITEORDER_STATUS.CLOSED); cacheOrder.setStatus(LITEORDER_STATUS.CLOSED);
liteOrderManager.save(cacheOrder); liteOrderManager.save(cacheOrder);
...@@ -847,6 +856,7 @@ public class LiteOrderCache { ...@@ -847,6 +856,7 @@ public class LiteOrderCache {
cacheOrder.setTaskReelCount(outCount); cacheOrder.setTaskReelCount(outCount);
cacheOrder.setTaskFinishedTime(-1); cacheOrder.setTaskFinishedTime(-1);
cacheOrder.setFinishedReelCount(0); cacheOrder.setFinishedReelCount(0);
cacheOrder.setStatus(LITEORDER_STATUS.ONE);
liteOrderManager.save(cacheOrder); liteOrderManager.save(cacheOrder);
liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder); liteOrderMap.put(cacheOrder.getOrderNo(), cacheOrder);
......
src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java
...@@ -777,7 +777,10 @@ public class OrderController { ...@@ -777,7 +777,10 @@ public class OrderController {
c.and("status").nin(LITEORDER_STATUS.CLOSED, LITEORDER_STATUS.NEW); c.and("status").nin(LITEORDER_STATUS.CLOSED, LITEORDER_STATUS.NEW);
Query query = new Query(c); Query query = new Query(c);
int exeCount = liteOrderManager.countByQuery(query); int exeCount = liteOrderManager.countByQuery(query);
int abCount = 0; Query query1=new Query();
query1.addCriteria(Criteria.where("status").is(LITEORDER_STATUS.CLOSED)
.and("appendData.shortage").is("true"));
int abCount = liteOrderManager.countByQuery(query1);
int waitCount = liteOrderManager.countByQuery(new Query(Criteria.where("status").is(LITEORDER_STATUS.NEW))); int waitCount = liteOrderManager.countByQuery(new Query(Criteria.where("status").is(LITEORDER_STATUS.NEW)));
OrderKanbanDto dto = new OrderKanbanDto(allCount, endCount, exeCount, abCount, waitCount); OrderKanbanDto dto = new OrderKanbanDto(allCount, endCount, exeCount, abCount, waitCount);
return dto; return dto;
......
src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java
package com.neotel.smfcore.core.order.service.po; package com.neotel.smfcore.core.order.service.po;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.neotel.smfcore.common.base.BasePo; import com.neotel.smfcore.common.base.BasePo;
import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS; import com.neotel.smfcore.core.order.enums.LITEORDER_STATUS;
...@@ -117,6 +118,26 @@ public class LiteOrder extends BasePo implements Serializable { ...@@ -117,6 +118,26 @@ public class LiteOrder extends BasePo implements Serializable {
} }
} }
public void setStatus(int s) {
this.status = s;
if(s>LITEORDER_STATUS.NEW&&s<LITEORDER_STATUS.CLOSED){
String lastOutType = getAppend("outType");
int outtype =0;
if (ObjectUtil.isNotEmpty(lastOutType)) {
try {
outtype = Convert.toInt(lastOutType);
} catch (Exception exception) {
}
}
if (outtype < s) {
outtype=s;
addAppendDate("outType", outtype + "");
}
}
}
/** /**
* 是否正在出首套料 * 是否正在出首套料
* @return * @return
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!