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

zhou zhou

2 天以前 fb98cd280dd1158e542cc8b94003612700ae4ea4

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

@@ -704,7 +704,7 @@
                        .setSourceId(outId)
                        .setSiteNo(param.getSiteNo());
                //增加备货出库类型判断
                Short type = wkOrder.getType().equals(OrderType.ORDER_Pre.type)
                Short type = wkOrder.getType().equals(OrderType.ORDER_PRE.type) || wkOrder.getType().equals(OrderType.ORDER_PRE_NOT_OUT.type)
                        ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
                        :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                try {