Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz

1

2 天以前 51c27e505842ce3343dfabfb994d2fc28ae0d8a8

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockServiceImpl.java

@@ -706,9 +706,12 @@
                //增加备货出库类型判断
                Short type = null;
                switch (wkOrder.getType()) {
                    case "preNot":
                    case "pre":
                        type = TaskResouceType.TASK_RESOUCE_STOCK_UP.val;
                        break;
                    case "preNot":
                        type = TaskResouceType.TASK_RESOUCE_STOCK_NOT_OUT.val;
                        break;
                    default:
                        type = TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                }