#

lty

5 天以前 fcc71e5d0f0eba3f192c581fad184cee0a43ce99

#

 src/main/java/com/zy/asrs/entity/dto/TvWrkDetlDto.java

@@ -9,6 +9,11 @@

    private String maktx;

    private String locNo;
    private String orderNo;
    private String source;
    private Double qty;

    private String specs;

    private String batch;

 src/main/java/com/zy/asrs/timer/WcsStationTimer.java

@@ -72,7 +72,7 @@
                    }

                    wcsStationDto.setStationId(stationId);
                    wcsStationDto.setTaskNo(object.getString("superTaskNo"));
                    wcsStationDto.setTaskNo(object.getString("taskNo"));
                    wcsStationDto.setAuto(object.getBoolean("autoing") ? 1 : 0);
                    wcsStationDto.setLoading(object.getBoolean("loading") ? 1 : 0);
                    wcsStationDto.setBarcode(object.getString("barcode"));

 src/main/java/com/zy/asrs/timer/WmsDataTimer.java

@@ -82,10 +82,14 @@
                        list.add(tvWrkDetlDto);

                        tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
                        tvWrkDetlDto.setOrderNo(wrkDetl.getString("orderNo"));
                        tvWrkDetlDto.setQty(wrkDetl.getDouble("units"));
                        tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
                        tvWrkDetlDto.setLocNo(wrkDetl.getString("boxType1"));
                        tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                        tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                        tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
                        tvWrkDetlDto.setSource(wrkDetl.getInteger("source")!=1?"软管":"软管护肤包装");
                    }

                    wcsStationDto.setIoType(data.getInteger("ioType"));
@@ -141,16 +145,20 @@
                    JSONObject data = jsonObject.getJSONObject("data");

                    List<TvWrkDetlDto> list = new ArrayList<>();
                    for (Object o : data.getJSONArray("combDetls")) {
                    for (Object o : data.getJSONArray("wrkDetls")) {
                        JSONObject wrkDetl = (JSONObject) o;
                        TvWrkDetlDto tvWrkDetlDto = new TvWrkDetlDto();
                        list.add(tvWrkDetlDto);

                        tvWrkDetlDto.setMatnr(wrkDetl.getString("matnr"));
                        tvWrkDetlDto.setOrderNo(wrkDetl.getString("orderNo"));
                        tvWrkDetlDto.setQty(wrkDetl.getDouble("anfme"));
                        tvWrkDetlDto.setMaktx(wrkDetl.getString("maktx"));
                        tvWrkDetlDto.setLocNo(wrkDetl.getString("locNo"));
                        tvWrkDetlDto.setSpecs(wrkDetl.getString("specs"));
                        tvWrkDetlDto.setBatch(wrkDetl.getString("batch"));
                        tvWrkDetlDto.setAnfme(wrkDetl.getDouble("anfme"));
                        tvWrkDetlDto.setSource(wrkDetl.getInteger("source")!=1?"软管":"软管护肤包装");
                    }

                    wcsStationDto.setIoType(1);