对接

zhang

昨天 e85f0e74d21e49b9c68474bc4d19f5eceacf1a46

对接

 src/main/java/com/zy/asrs/service/WrkMastLogService.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.service.IService;
import com.core.common.R;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastLog;

import java.util.Map;
@@ -10,6 +11,7 @@

    boolean save(Integer workNo);

    boolean saveLog(WrkMast workNo);
    /**
     * 查询库存移动流水记录
     */

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

@@ -4,11 +4,14 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.R;
import com.zy.asrs.entity.InventoryFlowDto;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastLog;
import com.zy.asrs.mapper.WrkMastLogMapper;
import com.zy.asrs.service.WrkMastLogService;
import com.zy.common.utils.Synchro;
import org.springframework.stereotype.Service;

import java.util.Date;
import java.util.Map;

@Service("wrkMastLogService")
@@ -20,6 +23,14 @@
    }

    @Override
    public boolean saveLog(WrkMast workNo) {
        WrkMastLog wrkMastLog=new WrkMastLog();
        Synchro.Copy(workNo,wrkMastLog);
        wrkMastLog.setModiTime(new Date());
        return this.baseMapper.insert(wrkMastLog) > 0;
    }

    @Override
    public R inventoryFlowList(Integer curr, Integer limit, Map<String, Object> param) {
        Page<InventoryFlowDto> page = new Page<>();
        page.setCurrent(curr);

 src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java

@@ -117,9 +117,14 @@
            //wrkMastService.updateById(wrkMast);

            // 保存工作主档历史档
            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
            if (!wrkMastLogService.saveLog(wrkMast)) {
                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
            }

            // 保存工作主档历史档
//            if (!wrkMastLogService.save(wrkMast.getWrkNo())) {
//                exceptionHandle("保存工作历史档[workNo={0}]失败", wrkMast.getWrkNo());
//            }
            // 删除工作主档
            if (!wrkMastService.deleteById(wrkMast)) {
                exceptionHandle("删除工作主档[workNo={0}]失败", wrkMast.getWrkNo());

 src/main/webapp/static/js/wrkMastLog/wrkMastLog.js

@@ -56,7 +56,7 @@
            // ,{field: 'crnEndTime$', align: 'center',title: '堆垛机停止时间'}
            // ,{field: 'plcStrTime$', align: 'center',title: '拣料时间'}
            ,{field: 'modiUser$', align: 'center',title: '操作人员'}
            ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}
            ,{field: 'modiTime$', align: 'center',title: '修改时间'}
            // ,{field: 'appeUser$', align: 'center',title: '创建者',event: 'appeUser', style: 'cursor:pointer'}
            // ,{field: 'appeTime$', align: 'center',title: '添加时间'}
            ,{field: 'barcode', align: 'center',title: '条码'}

 src/main/webapp/views/wrkMastLog/wrkMastLog.html

@@ -89,7 +89,7 @@
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/wrkMastLog/wrkMastLog.js?v=1" charset="utf-8"></script>

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>