Merge remote-tracking branch 'origin/jxhcasrs' into jxhcasrs

lty

18 小时以前 01fa93b5dd9f20286ef8f22515caf55307f76a9d

 src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java

@@ -16,6 +16,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Map;
import java.util.Objects;

@@ -36,8 +37,11 @@
        }
        WrkMastLog mastLog = new WrkMastLog();
        BeanUtils.copyProperties(mast, mastLog);
//        mastLog.setLogId(mast.getId());
//
        if (mast.getWrkSts() != null) {
            mastLog.setWrkSts(mast.getWrkSts().intValue());
        }
        mastLog.setLogId(Long.valueOf(mast.getWrkNo()));

        if (!wrkMastLogService.insert(mastLog)) {
            throw new CoolException("任务日志保存失败！！");
        }
@@ -55,4 +59,9 @@
        return R.ok(page);
    }

    @Override
    public List<InventoryFlowDto> inventoryFlowAll(Map<String, Object> param) {
        return this.baseMapper.inventoryFlowAll(param);
    }

}