Merge remote-tracking branch 'origin/tzhneasrs' into tzhneasrs

pjb

2024-12-31 c4e8e814d2c9e0d03f6449860b70e58657fd7dc2

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

@@ -34,6 +34,7 @@
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;

/**
 * Created by vincent on 2022/4/9
@@ -596,7 +597,8 @@
                OpenOrderPakoutParam.Body body = new OpenOrderPakoutParam.Body();
                body.setcInvCode(mat.getMatnr());
                body.setiQuantity(pla.getWeightAnfme());
                body.setcBatch("");
                body.setcBatch(pla.getBatch());
                body.setCPackage(pla.getPackageNo()+"");
                body.setCbMemo(pla.getMemo());
                bodyList.add(body);

@@ -612,16 +614,20 @@
                    body = new OpenOrderPakoutParam.Body();
                    body.setcInvCode(mat.getMatnr());
                    body.setiQuantity(pla.getWeightAnfme());
                    body.setcBatch(pla.getBatch());
                    body.setCPackage(pla.getPackageNo()+"");
                    body.setCbMemo(pla.getMemo());
                    bodyList.add(body);
                } else {
                    body.setiQuantity(body.getIQuantity() + pla.getWeightAnfme());
                    body.setcBatch(pla.getBatch());
                    body.setCPackage(pla.getPackageNo()+"");
                }
            }
        }

        for (OpenOrderPakoutParam param : list) {
            //doHttpRequest(param, "入库单上报", url, orderReportPath, null, "127.0.0.1");
            doHttpRequest(param, "入库单上报", url, orderReportPath, null, "127.0.0.1");

        }
        return 200;
@@ -692,6 +698,7 @@
            log.info("请求参数：{}", requestParam);
            response = new HttpHandler.Builder()
                    .setUri(url)
                    .setTimeout(30, TimeUnit.SECONDS)
                    .setPath(path)
                    .setJson(JSONObject.toJSONString(requestParam))
                    .build()