Merge remote-tracking branch 'origin/master'

myproject/src/main/java/com/myproject/bean/update/qisda/OutItem.java

@@ -139,6 +139,15 @@ public class OutItem extends BaseMongoBean {
      */
      */
     private String endOutInfo = "N";
     private String endOutInfo = "N";
 
 
+    private boolean isMergeOut=false;
+
+    public boolean getIsMergeOut() {
+        return isMergeOut;
+    }
+
+    public void setIsMergeOut(boolean isMergeOut) {
+        this.isMergeOut = isMergeOut;
+    }
     /**
     /**
      * 出库缺料情况
      * 出库缺料情况
      */
      */

myproject/src/main/java/com/myproject/webapp/controller/qisda/util/OutInfoCache.java

@@ -1276,12 +1276,21 @@ public class OutInfoCache {
         List<DataLog> tasks = new ArrayList<>();
         List<DataLog> tasks = new ArrayList<>();
         //紧急料,直接出库
         //紧急料,直接出库
         List<StoragePos> posList = storagePosDao.findBindList(outItem.gethSerial(),outItem.getId());
         List<StoragePos> posList = storagePosDao.findBindList(outItem.gethSerial(),outItem.getId());
-
+        boolean checkMerge=false;
+        if(mergeOutQty>0){
+            checkMerge=true;
+        }
         int outQty = outItem.getOutQty() + mergeOutQty;
         int outQty = outItem.getOutQty() + mergeOutQty;
 
 
+
         for (StoragePos pos : posList) {
         for (StoragePos pos : posList) {
             if(outQty > outItem.getQty()){
             if(outQty > outItem.getQty()){
                 log.info("需求单["+outItem.gethSerial()+"]PN["+outItem.getPn()+"]已发数量"+outQty+"满足需求"+outItem.getQty()+",不需要出库");
                 log.info("需求单["+outItem.gethSerial()+"]PN["+outItem.getPn()+"]已发数量"+outQty+"满足需求"+outItem.getQty()+",不需要出库");
+                if(checkMerge){
+                    outItem.setIsMergeOut(true);
+                    //更新到数据库
+                    outItemDao.save(outItem);
+                }
             }else{
             }else{
                 DataLog task = newTask(outItem, pos);
                 DataLog task = newTask(outItem, pos);
                 task = InquiryShelfBean.addUnlimitLoc(task, outItem);
                 task = InquiryShelfBean.addUnlimitLoc(task, outItem);

myproject/src/main/webapp/WEB-INF/pages/qisda/outInfoSearch.jsp

@@ -132,11 +132,11 @@
 
 
                         <display:column titleKey="绑定数量" sortable="true" sortProperty="totalBindNum" class="${closedClass}">
                         <display:column titleKey="绑定数量" sortable="true" sortProperty="totalBindNum" class="${closedClass}">
                             ${outInfo.totalBindNum}
                             ${outInfo.totalBindNum}
-                            <%--<c:if test="${!outInfo.closed}">--%>
-                                <%--<a href="#" class="right" onclick="closeOut('${outInfo.hSerial}')" id="${outInfo.hSerial}Btn">--%>
-                                    <%--[<fmt:message key="关闭"/>]--%>
-                                <%--</a>--%>
-                            <%--</c:if>--%>
+                            <c:if test="${!outInfo.closed}">
+                                <a href="#" class="right" onclick="closeOut('${outInfo.hSerial}')" id="${outInfo.hSerial}Btn">
+                                    [<fmt:message key="关闭"/>]
+                                </a>
+                            </c:if>
                         </display:column>
                         </display:column>
 
 
                         <display:column titleKey="创建时间" sortable="true" sortProperty="createDate" >
                         <display:column titleKey="创建时间" sortable="true" sortProperty="createDate" >
@@ -219,6 +219,9 @@
                         <th>
                         <th>
                             <fmt:message key="已发料"/>
                             <fmt:message key="已发料"/>
                         </th>
                         </th>
+                        <th>
+                            <fmt:message key="合并出库"/>
+                        </th>
                     </tr>
                     </tr>
                     </thead>
                     </thead>
                     <tbody class="theItems">
                     <tbody class="theItems">
@@ -318,8 +321,13 @@
                         }
                         }
                         var realLockQty = "<span class='"+realLockColor+" td-item'>"+lockQty+"</span>";
                         var realLockQty = "<span class='"+realLockColor+" td-item'>"+lockQty+"</span>";
 
 
+                        var isMergeOut=data[i].isMergeOut;
+                        var noMergeStr="";
+                        if(data[i].isMergeOut){
+                            noMergeStr="已合并";
+                        }
 
 
-                        table.row.add( [ /*index,*/ data[i].slotlocation, data[i].slotStr, data[i].pn, data[i].facility,data[i].reelID,data[i].reelcut,data[i].qty,realLockQty,outQty,sendQty] );
+                        table.row.add( [ /*index,*/ data[i].slotlocation, data[i].slotStr, data[i].pn, data[i].facility,data[i].reelID,data[i].reelcut,data[i].qty,realLockQty,outQty,sendQty,noMergeStr] );
                     }
                     }
                     table.order( [ 0, 'asc' ] ).draw();
                     table.order( [ 0, 'asc' ] ).draw();