#

tqs

2023-03-10 1f7f8e0b0708036dc3b8266ac4d1b48da31df816

 src/main/java/com/zy/common/web/WcsController.java

@@ -71,7 +71,8 @@

                //判断是否有入库动作   "N"没有  “Y”有
//                interData.getFQty().compareTo(waitPakin.getAnfme())
                if (waitPakin.getIoStatus().equals("N") && waitPakin.getAnfme() < interData.getFQty().doubleValue() ) {
                Double userQty = waitPakin.getNqty() - waitPakin.getAnfme(); //通知入库量 - 等待入库量 = 已完成入库数量; 修改数量不能小于已完成数量
                if (waitPakin.getIoStatus().equals("N") && userQty <= interData.getFQty().doubleValue() ) {
                    //判断传入的数量是否为0来执行删除或者修改
                    if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
                        waitPakinService.delete(wrapper);
@@ -82,7 +83,8 @@
                        object.put("msg", "删除成功");
                        jsonArray.add(object);
                    } else {
                        waitPakin.setAnfme(interData.getFQty().doubleValue());
//                        waitPakin.setAnfme(interData.getFQty().doubleValue());
                        waitPakin.setAnfme(interData.getFQty().doubleValue() - userQty);
                        waitPakinService.update(waitPakin, wrapper);
                        JSONObject object = new JSONObject();
                        object.put("Fnumber", interData.getFnumber());
@@ -97,7 +99,7 @@
                    object.put("FInterID", interData.getFInterID());
                    object.put("Fnumber", interData.getFnumber());
                    object.put("code", 500);
                    object.put("msg", "已在入库中，无法取消");
                    object.put("msg", "已入库数量大于待修改量，无法修改");
                    jsonArray.add(object);
                }
            }
@@ -220,6 +222,7 @@
        }

        jsonObject1.put("data", jsonArray);
        log.info("ERP取消任务--WMS返回结果===>>"+ jsonObject1.toJSONString());
        return jsonObject1;

    }