Changes

mrzhssss

2022-04-11 d2adac4e369165ec523c23e7ffd19fc5775d43b5

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

@@ -6,10 +6,8 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import zy.cloud.wms.manager.entity.Pickout;
import zy.cloud.wms.manager.entity.PickoutDetl;
import zy.cloud.wms.manager.service.PickoutDetlService;
import zy.cloud.wms.manager.service.PickoutService;
import zy.cloud.wms.manager.entity.*;
import zy.cloud.wms.manager.service.*;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
@@ -27,6 +25,14 @@
    private PickoutService pickoutService;
    @Autowired
    private PickoutDetlService pickoutDetlService;
    @Autowired
    private WaveService waveService;
    @Autowired
    private OrderService orderService;
    @Autowired
    private WaveDetlService waveDetlService;
    @Autowired
    private OrderDetlService orderDetlService;

    @RequestMapping(value = "/pickout/{id}/auth")
    @ManagerAuth
@@ -44,8 +50,11 @@
        EntityWrapper<Pickout> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(pickoutService.selectPage(new Page<>(curr, limit), wrapper));
//        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("wrk_sts",true);
        Page<Pickout> pickoutPage = pickoutService.selectPage(new Page<>(curr, limit), wrapper);

        return R.ok(pickoutPage);
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -82,9 +91,12 @@
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
            pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
             Pickout picout = pickoutService.selectOne(new EntityWrapper<Pickout>()
                     .eq("id", id));
             pickoutDetlService.delete(new EntityWrapper<PickoutDetl>()
                    .eq("head_id",id));
            pickoutService.deleteById(id);
            pickoutService.updateWaveStatus(picout.getWaveNo());
        }
        return R.ok();
    }
@@ -119,11 +131,141 @@
    @RequestMapping(value = "/pickout/check/column/auth")
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        Wrapper<Pickout> wrapper = new EntityWrapper<Pickout>()
                .eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != pickoutService.selectOne(wrapper)){
            return R.parse(BaseRes.REPEAT).add(getComment(Pickout.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
    }

    /**
     * 打印完成之后,将'未打印'状态替换为'拣货中'
     * @param pickout
     * @return
     */
    @RequestMapping("/pickout/print/auth")
    @ManagerAuth
    public R printed(@RequestBody Pickout pickout){
        /**
         * 打印完成,向后台更新数据
         */
        Date now = new Date();
        pickout.setPrintTimes(pickout.getPrintTimes() + 1);
        pickout.setUpdateTime(now);
        pickout.setUpdateBy(getUserId().intValue());
        pickout.setPickStaff(getUserId());
        pickout.setPickStart(now);
        pickout.setWrkSts(2L);
        pickoutService.update(pickout,new EntityWrapper<Pickout>()
                .eq("id",pickout.getId()));
        return R.ok();
    }

    /**
     * 点击完成按钮时,将状态从'拣货中'调整至'已完成'
     */
    @RequestMapping("/pickout/done/auth")
    @ManagerAuth
    public R donePickOut(@RequestBody Pickout pickout){
        HashSet<String> orderNos = new HashSet<>();
        /**
         * 反写拣货单
         */
        pickout.setWrkSts(3L);
        pickout.setPickEnd(new Date());
        pickoutService.update(pickout,new EntityWrapper<Pickout>()
                .eq("id",pickout.getId()));
        List<PickoutDetl> pickoutDetls = pickoutDetlService.selectList(new EntityWrapper<PickoutDetl>()
                .eq("head_id", pickout.getId()));
        if (Cools.isEmpty(pickoutDetls)) {
            return R.error("找不到拣货单明细");
        }
        /**
         * 反写波次
         */
        Wave wave = waveService.selectOne(new EntityWrapper<Wave>()
                .eq("wave_no", pickout.getWaveNo()));
        if (Cools.isEmpty(wave)) {
            return R.error("找不到对应波次");
        }
        wave.setStatus((short) 2);
        waveService.update(wave,new EntityWrapper<Wave>()
                .eq("id",wave.getId()));
        List<WaveDetl> waveDetls = waveDetlService.selectList(new EntityWrapper<WaveDetl>()
                .eq("wave_id", wave.getId()));


        if (Cools.isEmpty(waveDetls)) {
            return R.error("找不到对应波次明细");
        }

        /**
         * 反写出库订单
         */
        for (WaveDetl waveDetl : waveDetls) {
            String[] split = waveDetl.getOrderNos().split(",");
            for (String s : split) {
                orderNos.add(s);
            }
        }

        /**
         * 循环所有拣货单明细,依次分配给所有出库单
         */
        for (PickoutDetl pickoutDetl : pickoutDetls) {
            //获取本次波次生成拣货单之后,该物料总共捡了多少
            Double anfme = pickoutDetl.getAnfme();
            String matnr = pickoutDetl.getMatnr();
            /**
             * 获取所有的物料相同,且被包含在波次明细里的出库订单
             */
            List<OrderDetl> orderDetls = orderDetlService.selectOutList(matnr,new ArrayList<String>(orderNos));
            for (OrderDetl orderDetl : orderDetls) {
                /**
                 * 如果拣货单的剩余数量等于0,代表该物料已经分配完成,直接break
                 */
                if (anfme == 0.0 ){
                    break;
                }
                /**
                 * 如果拣货单的数量大于该出库单的数量,直接把出库所需量(out_qty)拉满
                 */
                if (anfme >= (orderDetl.getAnfme() - orderDetl.getOutQty())){
                    orderDetl.setOutQty(orderDetl.getAnfme());
                    anfme = anfme - (orderDetl.getAnfme() - orderDetl.getOutQty());

                    orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
                            .eq("id",orderDetl.getId()));
                    continue;
                }
                /**
                 * 如果拣货单的数量小于出库单的数量,证明该拣货单的物料已经不够分了,将
                 */
                if (anfme < (orderDetl.getAnfme() - orderDetl.getOutQty())){
                    orderDetl.setOutQty(anfme);
                    anfme = 0.0;
                    orderDetlService.update(orderDetl,new EntityWrapper<OrderDetl>()
                            .eq("id",orderDetl.getId()));
                }
            }
        }
        for (String orderNo : orderNos) {
            Order order = orderService.selectOne(new EntityWrapper<Order>()
                    .eq("order_no", orderNo));
            List<OrderDetl> orderDetls = orderDetlService.selectList(new EntityWrapper<OrderDetl>()
                    .eq("order_no", orderNo));
            for (OrderDetl orderDetl : orderDetls) {
                if (orderDetl.getAnfme() == orderDetl.getOutQty()){
                    break;
                }
            }
            order.setSettle(4L);
            orderService.update(order,new EntityWrapper<Order>()
                    .eq("order_no",orderNo));
        }

        return R.ok();
    }

}