#

zjj

2025-02-14 296092f6666919867ac630efd986a60642e3d71e

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

@@ -10,7 +10,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.InventoryCheckOrder;
import com.zy.asrs.entity.InventoryCheckOrderDetl;
import com.zy.asrs.entity.WrkDetl;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.InventoryCheckOrderDetlService;
import com.zy.asrs.service.InventoryCheckOrderService;
import com.zy.asrs.service.WrkDetlService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -22,6 +28,38 @@

    @Autowired
    private InventoryCheckOrderService inventoryCheckOrderService;
    @Autowired
    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private WrkDetlService wrkDetlService;

    @RequestMapping("/inventoryCheckOrder/StockCheck/select/barcode")
    @ManagerAuth()
    public R StockCheckSelectBarcode(@RequestParam String barcode) {
        if (Cools.isEmpty(barcode)) {
            return R.ok();
        }
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("barcode", barcode));
        if (Cools.isEmpty(wrkMast)) {
            return R.error("该条码未查询到盘点任务");
        }
        ArrayList<InventoryCheckOrderDetl> checkOrderDetls = new ArrayList<>();
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        for (WrkDetl wrkDetl : wrkDetls) {
            InventoryCheckOrderDetl checkDetl = inventoryCheckOrderDetlService.selectOne(new EntityWrapper<InventoryCheckOrderDetl>()
                    .eq("order_no", wrkMast.getSheetNo())
                    .eq("matnr", wrkDetl.getMatnr())
                    .eq("batch", wrkDetl.getBatch()));
            if (Cools.isEmpty(checkDetl)) {
                continue;
            }
            checkOrderDetls.add(checkDetl);

        }
        return R.ok(checkOrderDetls);
    }

    @RequestMapping("/inventoryCheckOrder/select/status/1")
    @ManagerAuth()
@@ -83,8 +121,20 @@
    @ManagerAuth
    public R add(@RequestBody InventoryCheckOrder inventoryCheckOrder) {
        String orderNo = inventoryCheckOrder.getOrderNo();
        long time = new Date().getTime();
        if (Cools.isEmpty(orderNo)) {
            return R.parse("单据编号不能为空：" + orderNo);
            switch (inventoryCheckOrder.getArea()){
                case "堆垛机":
                    orderNo = "DDJ"+time;
                    break;
                case "四向库":
                    orderNo = "SXK"+time;
                    break;
                case "CTU":
                    orderNo = "CTU"+time;
                    break;
            }
            inventoryCheckOrder.setOrderNo(orderNo);
        }

        int count = inventoryCheckOrderService.selectCount(new EntityWrapper<InventoryCheckOrder>().eq("order_no", orderNo));