Skip to content

孙克 / QisdaNew

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

线外发过分盘后,分盘料入库不再进行绑定

1 个父辈 68f8f835
内嵌 并排
正在显示 6 个修改的文件 包含 28 行增加 和 5 行删除
myproject/src/main/java/com/myproject/webapp/controller/user/DataLogSearchController.java
...@@ -118,7 +118,7 @@ public class DataLogSearchController extends BaseSearchController { ...@@ -118,7 +118,7 @@ public class DataLogSearchController extends BaseSearchController {
pageList.setPageNumber(-1); pageList.setPageNumber(-1);
}else{ }else{
if(pageList.getSortCriterion().equals("id")){ if(pageList.getSortCriterion().equals("id")){
pageList.setSortCriterion("updateDate"); pageList.setSortCriterion("id");
pageList.setSortDirection(SortOrderEnum.DESCENDING); pageList.setSortDirection(SortOrderEnum.DESCENDING);
searchCriteria.setPageList(pageList); searchCriteria.setPageList(pageList);
} }
......
myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaApiController.java
...@@ -337,6 +337,8 @@ public class QisdaApiController extends BaseController { ...@@ -337,6 +337,8 @@ public class QisdaApiController extends BaseController {
OutItem cutOutItem = soseqCache.getCutOutItem(soseq, Integer.valueOf(slotserial)); OutItem cutOutItem = soseqCache.getCutOutItem(soseq, Integer.valueOf(slotserial));
if(cutOutItem != null){ if(cutOutItem != null){
int realBindQty = cutOutItem.getRealLockQty() + outSendQty;
if(cutOutItem.isCutMaterial()){ if(cutOutItem.isCutMaterial()){
OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(soseq); OutInfo cutOutInfo = soseqCache.getCutActionInfoFromCache(soseq);
cutOutInfo = outInfoCache.addEventItem(cutOutInfo,"线外发料,解绑站位["+slotserial+"]"); cutOutInfo = outInfoCache.addEventItem(cutOutInfo,"线外发料,解绑站位["+slotserial+"]");
...@@ -355,10 +357,11 @@ public class QisdaApiController extends BaseController { ...@@ -355,10 +357,11 @@ public class QisdaApiController extends BaseController {
} }
} }
realBindQty = cutOutItem.getRealLockQty() + cutOutItem.getQty();
} }
//更新发料数量,更新真实绑定数量 //更新发料数量,更新真实绑定数量
soseqCache.addToTotalSendQty(cutOutItem,outSendQty); soseqCache.addToTotalSendQty(cutOutItem,outSendQty);
int realBindQty = cutOutItem.getRealLockQty() + outSendQty;
soseqCache.updateTotalRealLockQty(cutOutItem, realBindQty); soseqCache.updateTotalRealLockQty(cutOutItem, realBindQty);
//记录出入库日志 //记录出入库日志
saveOutLineTask(cutOutItem,reelid,pn,outSendQty); saveOutLineTask(cutOutItem,reelid,pn,outSendQty);
......
myproject/src/main/java/com/myproject/webapp/controller/webService/QisdaBindService.java
...@@ -339,6 +339,9 @@ public class QisdaBindService { ...@@ -339,6 +339,9 @@ public class QisdaBindService {
if(cutOutInfo != null && cutOutInfo.isClosed()){ if(cutOutInfo != null && cutOutInfo.isClosed()){
log.info("工单["+cutOutInfo.getSo()+"]已关闭,不再绑定料盘["+barcode.getBarcode()+"]"); log.info("工单["+cutOutInfo.getSo()+"]已关闭,不再绑定料盘["+barcode.getBarcode()+"]");
barcode = barcode.removeBindInfo(); barcode = barcode.removeBindInfo();
}else if(cutItem.realBindLessQty() <= 0){
log.info("工单["+cutOutInfo.getSo() + "的站位["+bindSlot+"]绑定已满足要求(或线外发过分盘料),不再对["+barcode.getBarcode()+"]进行绑定");
barcode = barcode.removeBindInfo();
}else{ }else{
//分盘料 //分盘料
if(cutItem.isCutMaterial()){ if(cutItem.isCutMaterial()){
......
myproject/src/main/webapp/WEB-INF/pages/qisda/orderOut.jsp
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
moveHandle + //outInfo.firstExecuteTime + moveHandle + //outInfo.firstExecuteTime +
'需求单:'+ outInfo.hSerial+' ['+outInfo.action+'] 工单: ' + outInfo.so +' 备料单: ' + outInfo.refno + '[' + outInfo.sendStatus +'] 工单序号:' + outInfo.soseq + '需求单:'+ outInfo.hSerial+' ['+outInfo.action+'] 工单: ' + outInfo.so +' 备料单: ' + outInfo.refno + '[' + outInfo.sendStatus +'] 工单序号:' + outInfo.soseq +
//'<span class="right">创建时间: '+createDate+'</span>' + //'<span class="right">创建时间: '+createDate+'</span>' +
'<span class="right">建议时间: '+sdate+'</span>' + // '<span class="right">建议时间: '+sdate+'</span>' +
'<span class="right">必须时间: '+mdate+'</span>' + '<span class="right">必须时间: '+mdate+'</span>' +
//'<span class="right">['+outInfo.firstExecuteTime+']</span>' + //'<span class="right">['+outInfo.firstExecuteTime+']</span>' +
'</a></h4></div>' + '</a></h4></div>' +
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
'<ul class="list-inline">' + '<ul class="list-inline">' +
'<li><i class="fa fa-tasks"></i>工单: '+outInfo.so+'</li>' + '<li><i class="fa fa-tasks"></i>工单: '+outInfo.so+'</li>' +
'<li><i class="fa fa-briefcase"></i>备料单: '+outInfo.refno+'</li>' + '<li><i class="fa fa-briefcase"></i>备料单: '+outInfo.refno+'</li>' +
// '<li><i class="fa fa-calendar"></i>建议时间:'+sdate+'</li>' + '<li><i class="fa fa-calendar"></i>建议时间:'+sdate+'</li>' +
'<li><i class="fa fa-star"></i>必须出仓日期:'+mdate+'</li>' + '<li><i class="fa fa-star"></i>必须出仓日期:'+mdate+'</li>' +
'<li><i class="fa fa-star"></i>创建时间:'+createDate+'</li>' + '<li><i class="fa fa-star"></i>创建时间:'+createDate+'</li>' +
'</ul>' + '</ul>' +
......
myproject/src/main/webapp/WEB-INF/pages/updateHistory.jsp
...@@ -12,6 +12,23 @@ ...@@ -12,6 +12,23 @@
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<ul class="timeline"> <ul class="timeline">
<li class="timeline-grey">
<div class="timeline-time">
<span class="date">2021</span>
<span class="time">08-11</span>
</div>
<div class="timeline-icon">
<i class="fa fa-clock-o"></i>
</div>
<div class="timeline-body">
<h2>版本: V2021081110</h2>
<div class="timeline-content">
<ul>
<li>线外发过分盘后,分盘料入库不再进行绑定</li>
</ul>
</div>
</div>
</li>
<li class="timeline-purple"> <li class="timeline-purple">
<div class="timeline-time"> <div class="timeline-time">
<span class="date">2021</span> <span class="date">2021</span>
......
myproject/src/main/webapp/decorators/metro.jsp
...@@ -239,7 +239,7 @@ ...@@ -239,7 +239,7 @@
<div class="page-footer-inner"> <div class="page-footer-inner">
2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a> 2016&copy; <a href="${ctx}/updateHistory.html">SMD BOX</a>
</div> </div>
<span class="right" style="color: #a3a3a3;">Version: 2021.07.28</span> <span class="right" style="color: #a3a3a3;">Version: 2021.08.11</span>
<div class="scroll-to-top"> <div class="scroll-to-top">
<i class="icon-arrow-up"></i> <i class="icon-arrow-up"></i>
</div> </div>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!