标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zjj
6 天以前 7b931b2de18e9034f7d1c5f42bf7d68cb4795269 
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/MobileServiceImpl.java


@@ -8,13 +8,12 @@


import com.vincent.rsf.framework.exception.CoolException;


import com.vincent.rsf.server.api.controller.params.*;


import com.vincent.rsf.server.api.entity.dto.*;


import com.vincent.rsf.server.api.entity.enums.OrderType;


import com.vincent.rsf.server.api.entity.enums.OrderWorkType;


import com.vincent.rsf.server.manager.enums.OrderType;


import com.vincent.rsf.server.manager.enums.OrderWorkType;


import com.vincent.rsf.server.api.service.MobileService;


import com.vincent.rsf.server.common.config.ConfigProperties;


import com.vincent.rsf.server.common.enums.WarehouseAreaType;


import com.vincent.rsf.server.common.security.JwtSubject;


import com.vincent.rsf.server.common.utils.CommonUtil;


import com.vincent.rsf.server.common.utils.FieldsUtils;


import com.vincent.rsf.server.common.utils.JwtUtil;


import com.vincent.rsf.server.manager.controller.params.GenerateTaskParams;


@@ -23,7 +22,6 @@


import com.vincent.rsf.server.manager.entity.*;


import com.vincent.rsf.server.manager.enums.AsnExceStatus;


import com.vincent.rsf.server.manager.enums.PakinIOStatus;


import com.vincent.rsf.server.manager.enums.QlyIsptResult;


import com.vincent.rsf.server.manager.enums.QlyIsptStatus;


import com.vincent.rsf.server.manager.mapper.*;


import com.vincent.rsf.server.manager.service.*;


@@ -38,7 +36,6 @@


import com.vincent.rsf.server.system.service.UserLoginService;


import com.vincent.rsf.server.system.service.UserService;


import com.vincent.rsf.server.system.utils.SerialRuleUtils;


import org.apache.commons.codec.digest.Md5Crypt;


import org.apache.commons.lang3.StringUtils;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


@@ -48,8 +45,6 @@




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.math.BigDecimal;


import java.nio.charset.StandardCharsets;


import java.util.*;


import java.util.stream.Collectors;




@@ -449,18 +444,19 @@


    public R getDeltByCode(Map<String, Object> params) {


        Object code = params.get("code");


        Object matnrCode = params.get("matnrCode");


        String batch = null;


        if (!Objects.isNull(params.get("batch"))) {


            batch = params.get("batch").toString();


        }


        Object asnCode = params.get("asnCode");


        Object batch = params.get("batch");




        //TODO 后续需根据策略配置，获取组拖数据。如：混装，按批次混装等


        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()


                .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch,unit, stock_unit,  qty, work_qty, matnr_code, matnr_id, maktx").lambda()


                .eq(!Objects.isNull(code), WarehouseAreasItem::getTrackCode, code)


                .eq(StringUtils.isNotBlank(batch), WarehouseAreasItem::getSplrBatch, batch)


                .eq(!Objects.isNull(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)


                .groupBy(WarehouseAreasItem::getSplrBatch, WarehouseAreasItem::getAsnId, WarehouseAreasItem::getAreaId, WarehouseAreasItem::getMatnrId);


        return R.ok(warehouseAreasItemService.list(queryWrapper));


        LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new LambdaQueryWrapper<WarehouseAreasItem>()


                .eq(!Cools.isEmpty(code), WarehouseAreasItem::getTrackCode, code)


                .eq(!Cools.isEmpty(batch), WarehouseAreasItem::getSplrBatch, batch)


                .eq(!Cools.isEmpty(matnrCode), WarehouseAreasItem::getMatnrCode, matnrCode)


                .eq(!Cools.isEmpty(asnCode), WarehouseAreasItem::getAsnCode, asnCode)


                ;


        List<WarehouseAreasItem> list = warehouseAreasItemService.list(queryWrapper);


        list.removeIf(e -> e.getAnfme() <= e.getWorkQty());


        return R.ok(list);


    }




    /**


@@ -474,11 +470,6 @@


    @Override


    public WaitPakin mergeItems(WaitPakinParam waitPakin, Long userId) {


        return waitPakinService.mergeItems(waitPakin, userId);


    }




    @Override


    public WaitPakin mergeMatnrItems(WaitPakinParam waitPakin, Long userId) {


        return waitPakinService.mergeMatnrItems(waitPakin, userId);


    }




    /**


@@ -706,6 +697,8 @@


        stock.setAnfme(sum)


                .setSourceId(order.getId())


                .setType(order.getType())


                .setUpdateBy(loginUserId)


                .setCreateBy(loginUserId)


                .setWkType(Short.parseShort(order.getWkType()));


        if (!stockService.save(stock)) {


            throw new CoolException("库存保存失败！！");


@@ -724,6 +717,8 @@


                    .setId(null)


                    .setLocCode(loc.getCode())


                    .setOrderId(order.getId())


                    .setUpdateBy(loginUserId)


                    .setUpdateBy(loginUserId)


                    .setOrderItemId(asnOrderItem.getId())


                    .setWkType(Short.parseShort(order.getWkType()))


                    .setType(order.getType());


@@ -841,9 +836,9 @@


     */


    @Override


    public R getItemByContainer(Map<String, Object> params) {


        if (Objects.isNull(params.get("code"))) {


            throw new CoolException("参数不能为空！！");


        }


//        if (Objects.isNull(params.get("code"))) {


//            throw new CoolException("参数不能为空！！");


//        }


        //获取组拖未生成任务的组拖档


        List<Short> asList = Arrays.asList(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val), Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));


        Short flagDefect = 0;


@@ -867,11 +862,8 @@


        } else {


            List<String> list = pakinItems.stream().map(WaitPakinItem::getTrackCode).collect(Collectors.toList());


            LambdaQueryWrapper<WarehouseAreasItem> queryWrapper = new QueryWrapper<WarehouseAreasItem>()


                    .select("SUM(anfme) as anfme, track_code, asn_code, id, splr_batch, ispt_result, plat_item_id, batch, qty, work_qty, matnr_code, matnr_id, maktx")


                    .lambda()


                    .in(WarehouseAreasItem::getTrackCode, list)


                    .groupBy(WarehouseAreasItem::getSplrBatch,


                            WarehouseAreasItem::getTrackCode);


                    .in(WarehouseAreasItem::getTrackCode, list);


            List<WarehouseAreasItem> warehouseAreasItems = warehouseAreasItemService.list(queryWrapper);


            for (int i = 0; i < warehouseAreasItems.size(); i++) {


                for (WaitPakinItem pakinItem : pakinItems) {


@@ -984,6 +976,7 @@


                    .setSplrBatch(asnOrderItem.getSplrBatch())


                    .setMatnr(asnOrderItem.getMatnrCode())


                    .setInspect(asnOrderItem.getIsptResult$()) //质检结果


                    .setPlatItemId(asnOrderItem.getPlatItemId())


            ;




            Matnr matnr = matnrMapper.selectById(asnOrderItem.getMatnrId());