#

luxiaotao1123

2022-04-19 6df368a849366e152cfecf1298631aafb56d0c00

#

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -46,6 +46,7 @@
        if (Cools.isEmpty(barcode)) {
            return R.parse(BaseRes.PARAM);
        }
        openService.packageUp(barcode);
        return R.ok();
    }


 src/main/java/com/zy/asrs/controller/PackController.java

@@ -1,22 +1,24 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

@RestController
public class PackController extends BaseController {
@@ -40,7 +42,9 @@
        EntityWrapper<Pack> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
            wrapper.orderBy("create_time", false);
        }
        return R.ok(packService.selectPage(new Page<>(curr, limit), wrapper));
    }


 src/main/java/com/zy/asrs/service/OpenService.java

@@ -35,5 +35,9 @@
     */
    List<StockVo> queryStock();

    // ------------------------------------------

    // 打包上线
    void packageUp(String barcode);

}

 src/main/java/com/zy/asrs/service/PackService.java

@@ -5,4 +5,6 @@

public interface PackService extends IService<Pack> {

    Pack selectByBarcode(String barcode);

}

 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java

@@ -5,10 +5,7 @@
import com.core.common.DateUtils;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OpenOrderCompleteParam;
import com.zy.asrs.entity.param.OpenOrderPakinParam;
import com.zy.asrs.entity.param.OpenOrderPakoutParam;
@@ -44,6 +41,8 @@
    private MatService matService;
    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private PackService packService;

    @Override
    @Transactional
@@ -311,4 +310,29 @@
        return locDetlService.queryStockTotal();
    }

    @Override
    public void packageUp(String barcode) {
        Pack pack = packService.selectByBarcode(barcode);
        if (null != pack) {
            throw new CoolException(barcode + "重复提交");
        }
        Date now = new Date();
        // todo:luxiaotao 解析条码规则，获取物料代码
        pack = new Pack(
                barcode,    // 条码[非空]
                null,    // 商品编号
                null,    // 批号
                1L,    // 订单状态
                1,    // 状态
                now,    // 添加时间
                null,    // 添加人员
                now,    // 修改时间
                null,    // 修改人员
                null    // 备注
        );
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误，请联系管理员");
        }
    }

}

 src/main/java/com/zy/asrs/service/impl/PackServiceImpl.java

@@ -1,12 +1,31 @@
package com.zy.asrs.service.impl;

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.mapper.PackMapper;
import com.zy.asrs.entity.Pack;
import com.zy.asrs.service.PackService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;

import java.util.List;

@Slf4j
@Service("packService")
public class PackServiceImpl extends ServiceImpl<PackMapper, Pack> implements PackService {

    @Override
    public Pack selectByBarcode(String barcode) {
        List<Pack> packs = this.selectList(new EntityWrapper<Pack>().eq("barcode", barcode));
        if (Cools.isEmpty(packs)) {
            return null;
        } else {
            if (packs.size() > 1) {
                log.error("打包上线条码重复！条码：{}", barcode);
            }
            return packs.get(0);
        }
    }

}