*

lsh

昨天 aacf537c160d210beea3c37a18f43f3183414ac0

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

@@ -16,10 +16,8 @@
import com.zy.asrs.entity.param.QualityGroupListParam;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.asrs.service.*;
import com.zy.asrs.service.impl.LocMastServiceImpl;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +34,6 @@

    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocDetlMapper locDetlMapper;
    @Autowired
@@ -51,10 +48,12 @@
    @Value("${srXghyMes.qualityFinishedCheckout}")
    private String qualityFinishedCheckout;

    @Value("${srXghyMes.productInventoryUrl}")
    private String productInventoryUrl;
    @Value("${srXghyMes.productInventory}")
    private String productInventory;
    @Value("${srXghyMes.productInventoryUrlSaveListDto}")
    private String productInventoryUrlSaveListDto;
    @Value("${srXghyMes.productInventorySaveListDto}")
    private String productInventorySaveListDto;
    @Autowired
    private LocMastServiceImpl locMastService;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -391,46 +390,58 @@
    @RequestMapping(value = "/synchronize/mes/locDetl/report/auth")
    @ManagerAuth(memo = "同步库存至MES")
    public R synchronizeLocDetlMes() {
        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>());
        if (locDetlList.isEmpty()) {
            return R.error("库存为空！！！");
        }
        try{
            List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("loc_sts", "F"));

        OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","成品入库");
        orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
        orderMesXGHYParam.setPalletizingNo(1);
            List<OrderMesXGHYParam> orderMesXGHYParams = new ArrayList<>();
            for (LocMast locMast : locMastList) {
                List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no",locMast.getLocNo()));
                if (locDetlList.isEmpty()) {
                    continue;
                }
                OrderMesXGHYParam orderMesXGHYParam = new OrderMesXGHYParam(locDetlList,"in","成品入库");
                orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
                orderMesXGHYParam.setPalletizingNo(1);
                orderMesXGHYParams.add(orderMesXGHYParam);
            }

            if (orderMesXGHYParams.isEmpty()) {
                return R.error("库存为空！！！");
            }

        String response = "";
        boolean success = false;
        try {
            response = new HttpHandler.Builder()
                    .setUri(productInventoryUrl)
                    .setPath(productInventory)
                    .setJson(JSON.toJSONString(orderMesXGHYParam))
                    .build()
                    .doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            if (jsonObject.getBoolean("state")) {
                success = true;
            } else {
                return R.error("同步库存至MES");
            String response = "";
            boolean success = false;
            try {
                response = new HttpHandler.Builder()
                        .setUri(productInventoryUrlSaveListDto)
                        .setPath(productInventorySaveListDto)
                        .setJson(JSON.toJSONString(orderMesXGHYParams))
                        .build()
                        .doPost();
                JSONObject jsonObject = JSON.parseObject(response);
                if (jsonObject.getBoolean("state")) {
                    success = true;
                } else {
                    return R.error("同步库存至MES");
                }
            } catch (Exception e) {
                return R.error("同步库存至MES"+e.getMessage());
            } finally {
                try {
                    // 保存接口日志
                    apiLogService.save(
                            "同步库存至MES",
                            productInventoryUrlSaveListDto+"/"+productInventorySaveListDto,
                            null,
                            "127.0.0.1",
                            JSON.toJSONString(orderMesXGHYParams),
                            response,
                            success
                    );
                } catch (Exception e) { }
            }
        } catch (Exception e) {
            return R.error("同步库存至MES"+e.getMessage());
        } finally {
            try {
                // 保存接口日志
                apiLogService.save(
                        "同步库存至MES",
                        productInventoryUrl+"/"+productInventory,
                        null,
                        "127.0.0.1",
                        JSON.toJSONString(orderMesXGHYParam),
                        response,
                        success
                );
            } catch (Exception e) { }
            return R.error("上报失败"+e.getMessage()).add("上报失败"+e.getMessage());
        }
        return R.error("上报失败").add("上报失败");
    }