#库存调整

zhou zhou

昨天 4e32eae9008b56a346f52710d86241890a0ae1a7

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

@@ -13,6 +13,7 @@
import com.zy.asrs.entity.param.CheckTaskListParam;
import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.result.CheckOrderExportDTO;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
import com.zy.common.entity.NodeExcel;
@@ -135,10 +136,14 @@
            checkOrderDetl.setBatch(locDetl.getBatch());
            checkOrderDetl.setSpecs(locDetl.getSpecs());
            checkOrderDetl.setAnfme(new BigDecimal(locDetl.getAnfme().toString()));
            checkOrderDetl.setQty(BigDecimal.ZERO);
            checkOrderDetl.setDiffQty(BigDecimal.ZERO);
            checkOrderDetl.setWorkQty(BigDecimal.ZERO);
            checkOrderDetl.setStatus(1);
            checkOrderDetl.setZpallet(locDetl.getZpallet());
            checkOrderDetl.setCreateBy(getUserId());
            checkOrderDetl.setCreateTime(now);
            checkOrderDetl.setUpdateBy(getUserId());
            checkOrderDetl.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl)) {
                throw new CoolException("保存盘点单明细失败");
            }
@@ -181,10 +186,14 @@
            checkOrderDetl1.setBatch(checkOrderDetl.getBatch());
            checkOrderDetl1.setSpecs(checkOrderDetl.getSpecs());
            checkOrderDetl1.setAnfme(checkOrderDetl.getAnfme());
            checkOrderDetl1.setQty(checkOrderDetl.getQty());
            checkOrderDetl1.setDiffQty(checkOrderDetl.getDiffQty());
            checkOrderDetl1.setWorkQty(checkOrderDetl.getWorkQty());
            checkOrderDetl1.setStatus(checkOrderDetl.getStatus());
            checkOrderDetl1.setZpallet(checkOrderDetl.getZpallet());
            checkOrderDetl1.setCreateBy(getUserId());
            checkOrderDetl1.setCreateTime(checkOrderDetl.getCreateTime() == null?now:checkOrderDetl.getCreateTime());
            checkOrderDetl1.setUpdateBy(getUserId());
            checkOrderDetl1.setUpdateTime(now);
            if (!checkOrderDetlService.insert(checkOrderDetl1)) {
                throw new CoolException("保存盘点单明细失败");
            }
@@ -212,6 +221,25 @@
        allLike(CheckOrder.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time", false);
        wrapper.eq("doc_type", OrderTypeEnum.INVENTORY.type);
        return R.ok(checkOrderService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/adjustOrder/list/auth")
    @ManagerAuth
    public R adjustList(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<CheckOrder> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(CheckOrder.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        wrapper.orderBy("create_time", false);
        wrapper.eq("doc_type", OrderTypeEnum.ADJUSTMENT.type);
        return R.ok(checkOrderService.selectPage(new Page<>(curr, limit), wrapper));
    }