标准版WMS
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
zjj
6 天以前 256c59555e2a5dffdd6d127a519d4f0944b80e7f 
 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderController.java


@@ -3,12 +3,15 @@


import com.alibaba.fastjson.JSONArray;


import com.alibaba.fastjson.JSONObject;


import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;


import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;


import com.baomidou.mybatisplus.extension.plugins.pagination.Page;


import com.vincent.rsf.framework.common.Cools;


import com.vincent.rsf.framework.common.R;


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


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


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


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


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


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


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


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


import com.vincent.rsf.server.common.annotation.OperationLog;


import com.vincent.rsf.server.common.domain.BaseParam;


@@ -18,11 +21,13 @@


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


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


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


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


import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;


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


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


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


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


import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;


import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;


import com.vincent.rsf.server.system.constant.SerialRuleCode;


import com.vincent.rsf.server.system.controller.BaseController;


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


@@ -30,10 +35,9 @@


import io.swagger.annotations.ApiOperation;


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


import org.springframework.security.access.prepost.PreAuthorize;


import org.springframework.transaction.annotation.Transactional;


import org.springframework.web.bind.annotation.*;


import org.springframework.web.multipart.MultipartFile;




import javax.mail.Multipart;


import javax.servlet.http.HttpServletResponse;


import java.util.*;


import java.util.stream.Collectors;


@@ -46,13 +50,20 @@


    private AsnOrderService asnOrderService;


    @Autowired


    private AsnOrderItemService asnOrderItemService;


    @Autowired


    private PurchaseServiceImpl purchaseService;


    @Autowired


    private PurchaseItemServiceImpl purchaseItemService;




    @PreAuthorize("hasAuthority('manager:asnOrder:list')")


    @PostMapping("/asnOrder/page")


    public R page(@RequestBody Map<String, Object> map) {


        BaseParam baseParam = buildParam(map, BaseParam.class);


        PageParam<AsnOrder, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrder.class);


        return R.ok().add(asnOrderService.page(pageParam, pageParam.buildWrapper(true)));


        QueryWrapper<AsnOrder> queryWrapper = pageParam.buildWrapper(true);


        List<String> asList = Arrays.asList(OrderType.ORDER_OUT.type);


        queryWrapper.notIn("type", asList);


        return R.ok().add(asnOrderService.page(pageParam, queryWrapper));


    }




    @PreAuthorize("hasAuthority('manager:asnOrder:list')")


@@ -107,11 +118,12 @@


    @PreAuthorize("hasAuthority('manager:asnOrder:remove')")


    @OperationLog("Delete ASN单据")


    @PostMapping("/asnOrder/remove/{ids}")


    @Transactional(rollbackFor = Exception.class)


    public R remove(@PathVariable Long[] ids) {


        if (!asnOrderService.removeByIds(Arrays.asList(ids))) {


            return R.error("Delete Fail");


        if (Objects.isNull(ids) || ids.length == 0) {


            return R.error("参数不能为空！！");


        }


        return R.ok("Delete Success").add(ids);


        return asnOrderService.removeOrders(Arrays.asList(ids));


    }




    @PreAuthorize("hasAuthority('manager:asnOrder:list')")


@@ -155,23 +167,15 @@


                template.setCode(order.getCode())


                        .setType(OrderType.getValType(order.getType()))


                        .setWkType(OrderWorkType.getWorkDesc(order.getWkType()))


                        .setExceStatus(AsnExceStatus.getExceStatus(order.getExceStatus()))


                        .setAnfme(item.getAnfme() + "")


                        .setMaktx(item.getMaktx())


                        .setMemo(item.getMemo())


                        .setMatnrCode(item.getMatnrCode())


                        .setPoCode(item.getPoCode())


                        .setSplrName(item.getSplrName())


                        .setPoId(order.getPoId() + "")


                        .setTrackCode(item.getTrackCode())


                        .setBarcode(item.getBarcode())


                        .setPackName(item.getPackName())


                        .setPlatItemId(item.getPlatItemId())


                        .setSplrBatch(item.getSplrBatch())


                        .setSplrCode(item.getSplrCode())


                        .setStockUnit(item.getStockUnit())


                        .setPurQty(item.getPurQty() + "")


                        .setPurUnit(item.getPurUnit());


                        .setSplrCode(item.getSplrCode());


                orderTemplates.add(template);


            }


        }


@@ -219,6 +223,25 @@


        return asnOrderService.saveOrderAndItems(params, getLoginUserId());


    }




    @PostMapping("/asnOrder/purchases/save")


    @ApiOperation("根据PO单新建收货单")


    @PreAuthorize("hasAuthority('manager:asnOrder:save')")


    public R orderCreateByPo(@RequestBody Map<String, Object> params) {


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


            return R.error("PO主单ID不能为空！！");


        }


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


            return R.error("明细单据不能为空！！");


        }


//        List<Long> ids = JSONArray.parseArray(params.get("ids").toString(), Long.class);


//        if (ids.isEmpty()) {


//            return R.error("参数不能为空");


//        }




        return asnOrderService.createByPo(params);


    }






    @ApiOperation("单据信息修改")


    @PostMapping("/asnOrder/items/update")


    @PreAuthorize("hasAuthority('manager:asnOrder:update')")