Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

IZCD4L12RTSW0VZ\Administrator

9 小时以前 43f9cf624b83c9d3d0e2280a1404dcc52695a18d

Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms

 src/main/java/com/zy/api/controller/KopenApiController.java

@@ -86,7 +86,7 @@
//        if (Objects.isNull(params.getKopen_id()) && Objects.isNull(params.getInv_no()) && Objects.isNull(params.getDispatch_no())) {
//            return XSR.error("取消条件不能为空！！");
//        }
        return kopenApiService.getInDispatchResult(params);
        return kopenApiService.getInDispatchResult(params, null);
    }

    /**

 src/main/java/com/zy/api/service/KopenApiService.java

@@ -9,6 +9,7 @@
import com.zy.api.entity.StockUpOrderParams;
import com.zy.api.entity.SyncMatParmas;
import com.zy.api.entity.dto.XSR;
import com.zy.asrs.entity.Order;

public interface KopenApiService {

@@ -41,10 +42,12 @@

    /**
     * 上架派工单反馈
     *
     * @param params
     * @param order
     * @return
     */
    XSR getInDispatchResult(List<ReportOrderParam> params);
    XSR getInDispatchResult(List<ReportOrderParam> params, Order order);

    /**
     * 备货指示派工单下发

 src/main/java/com/zy/api/service/impl/KopenApiServiceImpl.java

@@ -101,11 +101,12 @@
     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public XSR getInDispatchResult(List<ReportOrderParam> params) {
    public XSR getInDispatchResult(List<ReportOrderParam> params, Order order) {
        if (Objects.isNull(params)) {
            return XSR.error("参数不能为空！！");
        }
        String response = null;

        try {
            response = new HttpHandler.Builder()
                    .setUri(url + ":" + port)
@@ -118,13 +119,29 @@
            }
            JSONObject jsonObject = JSONObject.parseObject(response);
            Integer code = jsonObject.getInteger("code");
            if (!Objects.isNull(code) && code.equals(1)) {
            if (!Objects.isNull(code) && code.equals(200)) {
                if (!Objects.isNull(order)) {
                    order.setReportOnce(5);
                    orderService.updateById(order);
                }
                return XSR.ok("入库单上报完成！！");
            } else {
                if (!Objects.isNull(order)) {
                    int reportOnce = order.getReportOnce();
                    reportOnce ++;
                    order.setReportOnce(reportOnce);
                    orderService.updateById(order);
                }
                String msg = jsonObject.getString("message");
                return XSR.error(Objects.isNull(msg) ? "上报失败！！" : msg);
            }
        } catch (Exception e) {
            if (!Objects.isNull(order)) {
                int reportOnce = order.getReportOnce();
                reportOnce ++;
                order.setReportOnce(reportOnce);
                orderService.updateById(order);
            }
            log.error(e.getMessage(), e);
            return XSR.error(e.getMessage());
        }

 src/main/java/com/zy/asrs/entity/Order.java

@@ -220,6 +220,10 @@
    @TableField("ship_code")
    private String shipCode;

    @ApiModelProperty("上报次数")
    @TableField("report_once")
    private Integer reportOnce;

    /**
     * 订单状态
     */

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

@@ -309,8 +309,11 @@
            try {
                List<ReportOrderParam> orderParams = new ArrayList<>();
                orderParams.add(orderParam);
                response = kopenApiService.getInDispatchResult(orderParams);

                if (order.getReportOnce() < 4) {
                    response = kopenApiService.getInDispatchResult(orderParams, order);
                } else {
                    return FAIL;
                }
                // if (true) {
                // success = true;
                // // 修改订单状态 4.完成 ===>> 6.已上报