*

lsh

2 天以前 fc6a73660fb4c76a2b0479bb8108768b7ff0d146

*

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

@@ -79,7 +79,7 @@
        pack.setCreateBy(getUserId());
        pack.setCreateTime(now);
        if (!packService.insert(pack)) {
            throw new CoolException("服务器内部错误，请联系管理员");
            throw new CoolException("man_pack创建异常，请联系管理员");
        }
        Mat mat = new Mat();
        mat.setTagId(tagService.getTop().getId());
@@ -90,7 +90,7 @@
        mat.setUpdateTime(now);
        mat.setMemo("打包上线");
        if (!matService.insert(mat)) {
            throw new CoolException("服务器内部错误，请联系管理员");
            throw new CoolException("物料信息创建异常，请联系管理员");
        }
        return R.ok();
    }

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

@@ -427,7 +427,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(priTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("一级分类创建异常，请联系管理员");
                    }
                }
                // 二级分类
@@ -457,7 +457,7 @@
                            null    // 备注
                    );
                    if (tagMapper.insert(secTag) == 0) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("二级分类创建异常，请联系管理员");
                    }
                }
                tagId = secTag.getId();
@@ -473,7 +473,7 @@
            mat.setCreateTime(now);
            mat.setUpdateTime(now);
            if (!matService.insert(mat)) {
                throw new CoolException("服务器内部错误，请联系管理员");
                throw new CoolException("物料信息新增异常，请联系管理员");
            } else {
                log.info("打包上线添加新物料[商品编号：{}]", mat.getMatnr());
            }
@@ -527,7 +527,7 @@
                                null    // 备注
                        );
                        if (tagMapper.insert(priTag) == 0) {
                            throw new CoolException("服务器内部错误，请联系管理员");
                            throw new CoolException("一级分类创建异常，请联系管理员");
                        }
                    }
                    // 二级分类
@@ -557,7 +557,7 @@
                                null    // 备注
                        );
                        if (tagMapper.insert(secTag) == 0) {
                            throw new CoolException("服务器内部错误，请联系管理员");
                            throw new CoolException("二级分类创建异常，请联系管理员");
                        }
                    }
                    tagId = secTag.getId();
@@ -575,7 +575,7 @@
                mat.setCreateTime(now);
                mat.setUpdateTime(now);
                if (!matService.insert(mat)) {
                    throw new CoolException("服务器内部错误，请联系管理员");
                    throw new CoolException("新增物料信息异常，请联系管理员");
                } else {
                    log.info("同步新物料[商品编号：{}]", mat.getMatnr());
                }

 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java

@@ -38,7 +38,7 @@
        }
    }

//    @Scheduled(cron = "0/5 * * * * ? ")
    @Scheduled(cron = "0/5 * * * * ? ")
    @Async("orderThreadPool")
    public void completeAndReport(){
        String erpReport = Parameter.get().getErpReport();

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

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

import java.util.Date;
import java.util.List;

/**
@@ -75,21 +76,25 @@
                    success = true;
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("上报完成更新订单状态异常，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
                    order.setUpdateTime(new Date());
                    orderService.updateById(order);
                    throw new CoolException("上报mes系统失败");
                }
            } catch (Exception e) {
                log.error("fail", e);
//            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                order.setUpdateTime(new Date());
                orderService.updateById(order);
                return FAIL.setMsg(e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "成品库入库上报",
                            "胶料入库上报至ERP",
                            MesConstant.URL + MesConstant.PAKIN_URL,
                            null,
                            "127.0.0.1",
@@ -129,7 +134,7 @@
                    success = true;
                    // 修改订单状态 4.完成 ===>> 6.已上报
                    if (!orderService.updateSettle(order.getId(), 6L, null)) {
                        throw new CoolException("服务器内部错误，请联系管理员");
                        throw new CoolException("上报完成更新订单状态异常，请联系管理员");
                    }
                } else {
                    log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKOUT_URL, JSON.toJSONString(pakoutParam), response);

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

@@ -83,12 +83,14 @@
                            log.error("删除入库通知档[workNo={"+wrkMast.getWrkNo()+"}]失败");
                        }
                    }
//                    // 手动入库生成单据 【 上报三方平台 】
//                    if (!Cools.isEmpty(wrkDetls)) {
//                        if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
//                            exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
//                        }
//                    }
                    if (wrkMast.getCrnNo()>2 && wrkMast.getCrnNo()<6){
                        // 手动入库生成单据 【 上报三方平台 】
                        if (!Cools.isEmpty(wrkDetls)) {
                            if (!orderService.saveHandlerOrder(Boolean.TRUE, wrkMast, wrkDetls)) {
                                exceptionHandle("生成手动入库单据[workNo={0}]失败", wrkMast.getWrkNo());
                            }
                        }
                    }
                // 拣料再入库
                } else if (wrkMast.getIoType() == 53) {
//                    if (!Cools.isEmpty(wrkDetls)) {

 src/main/resources/mapper/OrderMapper.xml

@@ -54,12 +54,12 @@
    </update>

    <select id="selectComplete" resultMap="BaseResultMap">
        select top 5 *
        select top 10 *
        from man_order
        where 1=1
        and settle = 4
        and status = 1
        order by create_time asc
        order by update_time asc
    </select>

    <insert id="addToLogTable">