lsh#

1

2 天以前 546e85432dd65713b2852444b9478b3948d5d42e

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

@@ -276,7 +276,7 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R generateWavesOrderAuto(GenWaveParams params,String stationId) {
    public R generateWavesOrderAuto(GenWaveParams params,String stationId,String locCode) {
        if (Objects.isNull(params.getIds()) || params.getIds().isEmpty()) {
            throw new CoolException("参数不能为空！！");
        }
@@ -320,6 +320,7 @@
        double sum1 = waveItems.stream().mapToDouble(WaveItem::getAnfme).sum();
        wave.setAnfme(sum1).setGroupQty(waveItems.size());
        wave.setStationId(stationId);
        wave.setLocCode(locCode);
        if (!waveService.saveOrUpdate(wave)) {
            throw new CoolException("主单修改失败！！");
        }
@@ -703,9 +704,17 @@
                        .setSourceId(outId)
                        .setSiteNo(param.getSiteNo());
                //增加备货出库类型判断
                Short type = wkOrder.getWkType().equals(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type)
                        ?TaskResouceType.TASK_RESOUCE_STOCK_UP.val
                        :TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val;
                Short type = null;
                switch (wkOrder.getType()) {
                    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;
                }
                try {
                    //生成出库任务
                    locItemService.generateTask(type, taskParams, loginUserId);