#

mrzhssss

2022-09-06 ca0886f59d593821ac6b12ef0e8fd8cf3ff29549

#

 src/main/java/zy/cloud/wms/manager/controller/ItemController.java

@@ -142,8 +142,6 @@
        if (Cools.isEmpty(cstmr)) {
            throw new CoolException("找不到该客户,请检查");
        }


        item.setCustMan(cstmr.getName());
        item.setCustMobile(cstmr.getTel());
        item.setCustAdress(cstmr.getAddr());

 src/main/java/zy/cloud/wms/manager/controller/ProjectPlanController.java

@@ -270,8 +270,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/flowStatus")
    public R flowStatus(){
    public R flowStatus(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){

        EntityWrapper<FlowStatus> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        wrapper.orderBy("weight_num");
        List<FlowStatus> flowStatuses = flowStatusService.selectList(wrapper);

@@ -283,8 +292,17 @@
     * @return
     */
    @RequestMapping("/projectPlan/toFront")
    public R toFront(){
        List<Item> items = itemService.selectList(new EntityWrapper<Item>()
    public R toFront(
            @RequestParam(defaultValue = "1") Integer curr,
            @RequestParam(defaultValue = "10") Integer limit,
            @RequestParam(required = false) String orderByField,
            @RequestParam(required = false) String orderByType,
            @RequestParam Map<String, Object> param
    ){
        EntityWrapper<Item> itemEntityWrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, itemEntityWrapper);
        List<Item> items = itemService.selectList(itemEntityWrapper
                .eq("status","1"));
        List<ItemsDTO> itemsDTOs = new ArrayList<>();


 src/main/java/zy/cloud/wms/manager/service/impl/ItemServiceImpl.java

@@ -47,10 +47,10 @@
    @Transactional
    @Override
    public void insertAll(Item item) {

        this.insert(item);
        Integer isAsrs = item.getType().equals("10")? 1: 0;
        List<FlowStatus> allTypes = flowStatusService.selectList(new EntityWrapper<FlowStatus>()
                .eq("type", item.getType())
                .eq("is_asrs", isAsrs)
                .orderBy("weight_num",true));
        for (FlowStatus oneType : allTypes) {
            ProjectPlan projectPlan = new ProjectPlan();