1.虚拟回仓之后,工单出库bug修改

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLShelfHandler.java

@@ -377,7 +377,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
                         if (liteOrder != null && liteOrder.isTaskFinished()) {
                         if (liteOrder != null && liteOrder.isTaskFinished()) {
                             //工单任务已完成
                             //工单任务已完成
                             String orderNo = liteOrder.getOrderNo();
                             String orderNo = liteOrder.getOrderNo();
-                            String orderFinishedTxt = MessageUtils.getText("smfcore.order.finished", new String[]{orderNo}, request.getLocale(), "工单[0]的任务已全部完成");
+                            String orderFinishedTxt = MessageUtils.getText("smfcore.order.finished", new String[]{orderNo}, request.getLocale(), "工单[{0}]的任务已全部完成");
                             dataMap.put("orderFinishedTxt",orderFinishedTxt);
                             dataMap.put("orderFinishedTxt",orderFinishedTxt);
                             log.info("工单完成，返回 orderFinishedTxt， "+orderFinishedTxt);
                             log.info("工单完成，返回 orderFinishedTxt， "+orderFinishedTxt);
                         }
                         }

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -489,7 +489,7 @@ public class LiteOrderCache {
             int remainReelCount = orderItem.getNeedReelCount() - orderItem.getTotalOutReelCount();
             int remainReelCount = orderItem.getNeedReelCount() - orderItem.getTotalOutReelCount();
 
 
             //此PN未完成
             //此PN未完成
-            if (remainNum > 0) {
+            if (remainNum > 0 || remainReelCount > 0) {
                 if (outBom) {
                 if (outBom) {
                     //套料出库,设置剩余数量为1,这样就只会出一盘
                     //套料出库,设置剩余数量为1,这样就只会出一盘
                     remainNum = 1;
                     remainNum = 1;

src/main/java/com/neotel/smfcore/core/order/rest/OrderController.java

@@ -572,14 +572,14 @@ public class OrderController {
             findItem.setTotalOutNum(findItem.getTotalOutNum() + num);
             findItem.setTotalOutNum(findItem.getTotalOutNum() + num);
             findItem.setOutReelCount(findItem.getOutReelCount() + 1);
             findItem.setOutReelCount(findItem.getOutReelCount() + 1);
             findItem.setTotalOutReelCount(findItem.getTotalOutReelCount() + 1);
             findItem.setTotalOutReelCount(findItem.getTotalOutReelCount() + 1);
-            findItem.setNeedReelCount(findItem.getNeedReelCount() + 1);
+            //findItem.setNeedReelCount(findItem.getNeedReelCount() + 1);
             liteOrderItemManager.save(findItem);
             liteOrderItemManager.save(findItem);
             liteOrder.updateOrderItems(findItem);
             liteOrder.updateOrderItems(findItem);
 
 
             //工单未关闭的话,检查状态,全部都出完进行关闭
             //工单未关闭的话,检查状态,全部都出完进行关闭
             boolean closed = true;
             boolean closed = true;
             for (LiteOrderItem liteOrderItem : liteOrder.getOrderItems()) {
             for (LiteOrderItem liteOrderItem : liteOrder.getOrderItems()) {
-                if (!liteOrderItem.isOutFinished()) {
+                if (!liteOrderItem.isOutFinished() || !liteOrderItem.isOutReelFinished()) {
                     closed = false;
                     closed = false;
                     break;
                     break;
                 }
                 }