1.平仓日入库功能改造

王佳豪

2021-06-22 d26dbc9cb768a03008f4f3ed04be7b7b6750aa29

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

@@ -1,5 +1,6 @@
package com.zy.asrs.controller;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -8,11 +9,14 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.LocNormalLog;
import com.zy.asrs.entity.param.LocNormalStockOutParam;
import com.zy.asrs.entity.param.StockOutParam;
import com.zy.asrs.service.LocNormalLogService;
import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.OutStockService;
import com.zy.asrs.service.WorkService;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.entity.OutStockBillEntry;
import com.zy.common.web.BaseController;
@@ -41,6 +45,8 @@
    private LocNormalService locNormalService;
    @Autowired
    private ErpService erpService;
    @Autowired
    private LocNormalLogService locNormalLogService;

    /**
     *
@@ -124,9 +130,20 @@
                    logLocNormal.setMemo(locNormal.getMemo());
                    logLocNormal.setState("2");
                    // 生成出库记录
                    locNormalService.insert(logLocNormal);
//                    locNormalService.insert(logLocNormal);
                    // 更新原先平仓记录
                    locNormalService.updateLocNormal(locNormal.getMatnr(), locNormal.getAnfme().subtract(locNormals.getAnfme()), modiUser, modiTime, locNormal.getId());
                    // 生成平仓出入库记录
                    LocNormalLog locLog = new LocNormalLog();
                    VersionUtils.setLocNormalLog(locLog, locNormals);
                    locLog.setAnfme(locNormals.getAnfme().doubleValue());
                    locLog.setIoType(2);
                    locLog.setCreateTime(new Date());
                    locLog.setCreateUser(modiUser);
                    if (!locNormalLogService.insert(locLog)) {
                        String logStr = JSON.toJSONString(locLog);
                        log.info("平仓出库记录插入失败,数据:" + logStr);
                    }
                } else {
                    // 把对应物料平仓库存出库
                    locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId());