#

18516761980

2022-09-01 3e8b02f468f302763c3792efa3f9164dae3e0874

#

 src/main/java/com/zy/asrs/entity/WaitPakin.java

@@ -80,6 +80,12 @@
    private Double anfme;

    /**
     * 收料数量
     */
    @ApiModelProperty(value= "收料数量")
    private Double nqty;

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")

 src/main/java/com/zy/asrs/entity/WaitPakinLog.java

@@ -72,6 +72,12 @@
    private Double anfme;

    /**
     * 收料数量
     */
    @ApiModelProperty(value= "收料数量")
    private Double nqty;

    /**
     * 单位
     */
    @ApiModelProperty(value= "单位")

 src/main/java/com/zy/common/service/erp/task/ErpScheduler.java

@@ -98,6 +98,7 @@
                    try {
                        if (one == null) {
                            waitPakin.setAnfme(entry.getFAuxQty());
                            waitPakin.setNqty(entry.getFAuxQty());
                            if (!waitPakinService.insert(waitPakin)) {
                                log.error("提取原材料入库通知单InStockBillEntry失败[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
                            } else {
@@ -105,6 +106,7 @@
                            }
                        } else {
                            waitPakin.setAnfme(entry.getFAuxQty());
                            waitPakin.setNqty(entry.getFAuxQty());
                            if (!waitPakinService.update(waitPakin, wrapper)) {
                                log.error("更新原材料入库通知单InStockBillEntry失败[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
                            } else {
@@ -167,6 +169,7 @@
                WaitPakin one = waitPakinService.selectOne(wrapper);
                if (one == null) {
                    waitPakin.setAnfme(cpicmo.getFAuxQty());
                    waitPakin.setNqty(cpicmo.getFAuxQty());
                    if (!waitPakinService.insert(waitPakin)) {
                        log.error("提取成品入库通知单CPICMO失败[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
                    } else {
@@ -174,6 +177,7 @@
                    }
                } else {
                    waitPakin.setAnfme(cpicmo.getFAuxQty());
                    waitPakin.setNqty(cpicmo.getFAuxQty());
                    if (!waitPakinService.update(waitPakin, wrapper)) {
                        log.error("同步更新成品入库通知单CPICMO失败[FBillNo={},Fnumber={}]", waitPakin.getSupplier(), waitPakin.getMatnr());
                    } else {

 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);
                }
            }

 src/main/resources/mapper/WaitPakinLogMapper.xml

@@ -13,6 +13,7 @@
        <result column="warehouse" property="warehouse" />
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="nqty" property="nqty" />
        <result column="altme" property="altme" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />

 src/main/resources/mapper/WaitPakinMapper.xml

@@ -13,6 +13,7 @@
        <result column="warehouse" property="warehouse" />
        <result column="brand" property="brand" />
        <result column="anfme" property="anfme" />
        <result column="nqty" property="nqty" />
        <result column="altme" property="altme" />
        <result column="zpallet" property="zpallet" />
        <result column="bname" property="bname" />