lsh#

1

昨天 4f47f94957e67df0864930a2f638e9bdc8411b36

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java

@@ -10,11 +10,13 @@
import com.vincent.rsf.server.api.entity.params.OrderOutGeneralParam;
import com.vincent.rsf.server.api.service.PdaOutStockService;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams;
import com.vincent.rsf.server.manager.entity.Loc;
import com.vincent.rsf.server.manager.entity.LocItem;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.service.OutStockItemService;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.DictData;
@@ -26,6 +28,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;

@@ -42,6 +45,12 @@
    private OutStockItemService outStockItemService;
    @Autowired
    private DictDataService dictDataService;
    @Autowired
    private AsnOrderItemService asnOrderItemService;
    @Autowired
    private LocService locService;
    @Autowired
    private LocItemService locItemService;

    @GetMapping("/outStockTaskItem/{barcode}")
    @ApiOperation("快速拣货查询")
@@ -108,12 +117,14 @@

    @RequestMapping(value = "/orderOut/list")
    public R pdaPageList(@RequestParam(required = true) String orderNo,
                         @RequestParam(required = true) String orderType,
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "5") Integer limit) {

        Page<WkOrder> page = new Page<>(curr, limit);
        LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
        wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type);
        wkOrderLambdaQueryWrapper.eq(WkOrder::getWkType, orderType);
        wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo);
        Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper);
        return R.ok(wkOrderPage);
@@ -144,16 +155,29 @@
        orderOutTaskParam.setOrderId(param.getOrderItemId());
        orderOutTaskParam.setWaveId(param.getWaveId());

        return outStockService.getOrderOutTaskItem(orderOutTaskParam);

//        return R.ok();
        return outStockService.getOrderOutTaskItem(orderOutTaskParam,param.getOrderItemId());
    }
    //
    @PostMapping("/orderOut/getOutLocRun")
    public R orderOutGetOutLocRun(@RequestBody OrderOutGeneralParam param) {
        //参数 param.getOrderItemId()//出库执行
        LocItem locItem = locItemService.getById(param.getItemId());
        if (Cools.isEmpty(locItem)) {
            return R.error().add("未查询到库存明细");
        }
        Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, locItem.getLocCode()));

        return R.ok();
        if (Cools.isEmpty(loc)) {
            return R.error().add("未查询到库位信息");
        }
        WkOrderItem orderItem = asnOrderItemService.getById(param.getOrderItemId());


        List<OutStockToTaskParams> tasks = new ArrayList<>();
        OutStockToTaskParams outStockToTaskParams = new OutStockToTaskParams(orderItem);
        outStockToTaskParams.setLocCode(loc.getCode());
        outStockToTaskParams.setSiteNo(param.getOutSta().toString());
        tasks.add(outStockToTaskParams);
        return outStockService.genOutStockTask(tasks,getLoginUserId(), orderItem.getOrderId());
    }

}