#

pjb

2024-09-04 d62f66a249ee0f0e8393fb1d269d9ba540a8bd91

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

@@ -3,14 +3,17 @@
import com.alibaba.excel.EasyExcel;
import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.GlobleParameter;
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.PlaExcelListener;
import com.zy.asrs.utils.SaasUtils;
@@ -48,6 +51,9 @@
    private PlaLogService plaLogService;
    @Autowired
    private MatService matService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;


    @RequestMapping(value = "/pla/list/auth")
    @ManagerAuth
@@ -62,9 +68,19 @@
            wrapper.eq("brand",param.get("brand"));
            param.remove("brand");
        }
        // 没有选择的时候默认不显示已出库的物料
        if (Cools.isEmpty(param.get("status"))) {
            wrapper.ne("status", "全部出库");
        }

        if (!Cools.isEmpty(param.get("batch")) && param.get("batch").toString().contains(",")){
            String[] batchs = param.get("batch").toString().split(",");
            wrapper.in("batch",batchs);
            param.remove("batch");
        }

        convert(param, wrapper);
        wrapper.orderBy("modify_time",false);
        wrapper.orderBy("batch",true).orderBy("package_no" ,true);
        allLike(Pla.class, param.keySet(), wrapper, condition);
        return R.ok(plaService.selectPage(new Page<>(curr, limit), wrapper));
    }
@@ -143,7 +159,11 @@
        for (Pla pla : plas){

            if(pla.getStockFreeze() == 0){
                throw new CoolException("库存已被冻结，请重新选择库存");
//                throw new CoolException("库存已被冻结，请重新选择库存");
                System.out.println(pla.getStockFreezeBy() + "," + getUser().getUsername());
                if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
                    throw new CoolException("该库存已被其他用户冻结，请重新选择");
                }
            }

            allOrderWeight += pla.getOrderWeight();
@@ -166,7 +186,7 @@
            plaService.updateById(pla);
            plaQtyService.insert(plaQty);
            //生成拣货单
            addPakOUT(plaQty);
            addPakOUT(plaQty,getUserId());

        };

@@ -209,7 +229,7 @@
            pla.setWeightAnfme(0.0);
            plaService.updateById(pla);
            SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,getUser().getUsername(),
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop());
                    null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null);
        });

        return R.ok();
@@ -224,7 +244,8 @@
        }
        for (Pla pla : plas){
            if (pla.getStockFreeze() == 0){
                throw new CoolException("库存已被冻结！");
                continue;
//                throw new CoolException("库存已被冻结！");
            }
            pla.setStockFreeze(0);
            pla.setStockFreezeBy(getUser().getUsername());
@@ -243,7 +264,8 @@
        }
        for (Pla pla : plas){
            if (pla.getStockFreeze() == 1){
                throw new CoolException("库位未冻结，无需解冻");
                continue;
//                throw new CoolException("库位未冻结，无需解冻");
            }
            if(!Cools.eq(pla.getStockFreezeBy(),getUser().getUsername())){
                throw new CoolException("无法解冻其他用户冻结的库位");
@@ -332,6 +354,27 @@
        return R.ok().add(res);
    }

    /*************************************** xm-select ***********************************************/

    // xm-select 搜索批号
    @RequestMapping("/pla/batch/all/get/kv")
    @ManagerAuth
    public R getMatDataKV(@RequestParam(required = false) String condition) {
        Wrapper<Pla> wrapper = new EntityWrapper<Pla>().setSqlSelect("batch")
                .andNew().like("batch", condition)
                .groupBy("batch")
                .orderBy("batch",false);
        List<Pla> plas = plaService.selectPage(new Page<Pla>(1, 30), wrapper).getRecords();
        List<KeyValueVo> valueVos = new ArrayList<>();
        for (Pla pla : plas) {
            KeyValueVo vo = new KeyValueVo();
            vo.setName(pla.getBatch());
            vo.setValue(pla.getBatch());
            valueVos.add(vo);
        }
        return R.ok().add(valueVos);
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
@@ -349,9 +392,10 @@
        }
    }

    private R addPakOUT(PlaQty plaQty){
    @Synchronized
    private R addPakOUT(PlaQty plaQty,Long userId){
        ManPakOut manPakOut=new ManPakOut();
        manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+System.currentTimeMillis());
        manPakOut.setWrkNo(plaQty.getOrderNo()+"-"+String.valueOf(snowflakeIdWorker.nextId()));
        manPakOut.setWrkSts((long)1);
        manPakOut.setAnfme(plaQty.getOrderWeight());
        manPakOut.setMaktx(plaQty.getBrand());
@@ -367,6 +411,9 @@
        manPakOut.setDocId(plaQty.getOrderDetlId());
        manPakOut.setNodeId(plaQty.getId());
        manPakOut.setCustName(plaQty.getCustomer());
        manPakOut.setCreateBy(userId);
        //预计发货时间
        manPakOut.setSpecs(plaQty.getPakoutTime());
        //manPakOut.setNodeId(plaQty.getOrderDetlId());
        manPakOutService.insert(manPakOut);
        return R.ok();