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

zyx

2024-07-04 cb1f6d4df311494908b6ca50ac9a7e1fbfd5861f

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

 src/main/java/com/zy/asrs/entity/param/OpenOrderPakoutParam.java

@@ -49,7 +49,7 @@
    }

    public void setdDate(String dDate) throws ParseException {
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/DD hh:mm:ss");
        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-DD hh:mm:ss");
        this.dDate =  sdf.parse(dDate);
    }


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

@@ -587,8 +587,8 @@
                OpenOrderPakoutParam param = new OpenOrderPakoutParam();
                String type = Cools.isEmpty(pla.getProOrderNo()) ? "调拨入库单" : "生产入库单";
                param.setcCode(pla.getProOrderNo());
                param.setcAccount(pla.getOwner());
                param.setdDate(Utils.getDateStr1(new Date()));
                param.setcAccount(pla.getWorkshop());
                param.setdDate(Utils.getDateStr(new Date()));
                param.setType(type);

                List<OpenOrderPakoutParam.Body> bodyList = new ArrayList<>();

 src/main/resources/application.yml

@@ -60,5 +60,5 @@
  enable: false

u8:
  url: localhost:8080
  path: /test/report
  url: 122.225.245.106:10076
  path: /api/Yp/U8API

 src/main/webapp/views/pla/sellout.html

@@ -246,7 +246,7 @@
                checkData[i].customer = $('#customer').val();
                checkData[i].phone = $('#phone').val();
                checkData[i].addr = $('#addr').val();
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme;
                checkData[i].orderWeight = detailData[i] ? detailData[i].weight : checkData[i].weightAnfme - checkData[i].qtyAnfme;
                checkData[i].allocate = $('#allocate').val();
                checkData[i].memo = $('#memo').val();
                checkData[i].pakoutTime = $('#pakoutTime').val();