*

lsh

17 小时以前 2b78f39309bf25641d8a050ab82fedd7cfb5b300

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

@@ -22,6 +22,7 @@
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +51,11 @@
    private WrkDetlServiceImpl wrkDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;

    @Value("${srXghyMes.productInventoryUrl}")
    private String productInventoryUrl;
    @Value("${srXghyMes.productInventory}")
    private String productInventory;

    @Transactional
    public ReturnT<String> start(Order order) {
@@ -166,12 +172,11 @@

    @Transactional
    public ReturnT<String> startV1(WrkMast wrkMast) {
//        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
        List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
//        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
        if (wrkDetls.isEmpty()) {
            return SUCCESS;
        }
        String packageGroupNo;   //包装组号（徐工没有，只有箱号卷号一对一）  //null
        String outOrIn;   //out 出；in入；
        /*
         * 接口1=》不合格品出库二楼： 不合格品出库
@@ -204,6 +209,7 @@
        }
        for (WrkDetl wrkDetl : wrkDetls) {
            if (outOrIn.equals("out")){
                wrkDetl.setManu("成品出库");
                if (!Cools.isEmpty(stockType) && stockType.equals("盘点出库")){
                    wrkDetl.setManu("盘点出库");
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("不合格品出库")){
@@ -215,14 +221,14 @@
//                                packageGroupNo = order.getItemName();
                                wrkDetl.setDeadTime(order.getItemName());
                            }
                            wrkDetl.setManu(docType.getDocName$());
                            wrkDetl.setManu(docType.getDocName$(outOrIn));
                        } else {
                            wrkDetl.setManu("成品出库");
                        }
                    } else {
                        wrkDetl.setManu("成品出库");
                    }
                } else if (wrkDetl.getOrderNo().equals("不合格品出库")){
                } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("不合格品出库")){
                    wrkDetl.setManu("不合格品出库");
                }
            } else {
@@ -251,8 +257,8 @@
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(MesConstant.URL)
                    .setPath(MesConstant.PAKIN_URL)
                    .setUri(productInventoryUrl)
                    .setPath(productInventory)
                    .setJson(JSON.toJSONString(orderMesXGHYParam))
                    .build()
                    .doPost();
@@ -260,7 +266,7 @@
            if (jsonObject.getInteger("code").equals(200)) {
                success = true;
            } else {
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(orderMesXGHYParam), response);
                log.error("请求接口失败！！！url：{}；request：{}；response：{}", productInventoryUrl+"/"+productInventory, JSON.toJSONString(orderMesXGHYParam), response);
            }
        } catch (Exception e) {
            log.error("fail", e);
@@ -270,8 +276,8 @@
            try {
                // 保存接口日志
                apiLogService.save(
                        "成品库入库上报",
                        MesConstant.URL + MesConstant.PAKIN_URL,
                        "成品库入出库上报MES",
                        productInventoryUrl+"/"+productInventory,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(orderMesXGHYParam),
@@ -280,7 +286,6 @@
                );
            } catch (Exception e) { log.error("", e); }
        }
//        System.out.println(orderMesXGHYParam.toString());
        return SUCCESS;
    }