#

18516761980

2022-05-30 1baeb88125f264fa1949a17a83a2c83182f79499

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

@@ -43,11 +43,22 @@
        JSONObject jsonObject1 = new JSONObject();
        JSONArray jsonArray = new JSONArray();
        for (InterData interData : list) {
            //查询对应入库通知档信息
            Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
            WaitPakin waitPakin = waitPakinService.selectOne(wrapper);

            if ((interData.getIoType() == 1 && interData.getMatType() == 1) || (interData.getIoType() == 2 && interData.getMatType() == 2)) {
            //原材料入庫
            if ((interData.getIoType() == 1 && interData.getMatType() == 1)) {
                //查询对应入库通知档信息
                Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
                WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
                if(Cools.isEmpty(waitPakin)){
                    JSONObject object = new JSONObject();
                    object.put("FInterID", interData.getFInterID());
                    object.put("Fnumber", interData.getFnumber());
                    object.put("code", 500);
                    object.put("msg", "单据不存在或单据已被删除");
                    jsonArray.add(object);
                    continue;
                }

                if (Cools.isEmpty(waitPakin)) {
                    JSONObject object = new JSONObject();
                    object.put("FInterID", interData.getFInterID());
@@ -57,8 +68,10 @@
                    jsonArray.add(object);
                    continue;
                }
                //判断是否有出库动作   "N"没有  “Y”有
                if (waitPakin.getIoStatus().equals("N")) {

                //判断是否有入库动作   "N"没有  “Y”有
//                interData.getFQty().compareTo(waitPakin.getAnfme())
                if (waitPakin.getIoStatus().equals("N") && waitPakin.getAnfme() < interData.getFQty().doubleValue() ) {
                    //判断传入的数量是否为0来执行删除或者修改
                    if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
                        waitPakinService.delete(wrapper);
@@ -89,6 +102,68 @@
                }
            }

            //成品入庫
            if (interData.getIoType() == 2 && interData.getMatType() == 2) {
                //查询对应入库通知档信息
                Wrapper wrapper = new EntityWrapper<WaitPakin>().eq("supplier", interData.getFBillNo()).eq("matnr", interData.getFnumber());
                WaitPakin waitPakin = waitPakinService.selectOne(wrapper);
                if(Cools.isEmpty(waitPakin)){
                    JSONObject object = new JSONObject();
                    object.put("FInterID", interData.getFInterID());
                    object.put("Fnumber", interData.getFnumber());
                    object.put("code", 500);
                    object.put("msg", "单据不存在或单据已被删除");
                    jsonArray.add(object);
                    continue;
                }

                if (Cools.isEmpty(waitPakin)) {
                    JSONObject object = new JSONObject();
                    object.put("FInterID", interData.getFInterID());
                    object.put("Fnumber", interData.getFnumber());
                    object.put("code", 500);
                    object.put("msg", "单据不存在或单据已被删除");
                    jsonArray.add(object);
                    continue;
                }

                WaitPakin one = waitPakinService.selectOne(new EntityWrapper<WaitPakin>()
                        .eq("supplier", interData.getFBillNo())
                        .eq("matnr", interData.getFnumber())
                        .isNotNull("zpallet"));
                //判断是否有入库动作   "N"没有  “Y”有
                if (waitPakin.getIoStatus().equals("N") && Cools.isEmpty(one)) {
                    //判断传入的数量是否为0来执行删除或者修改
                    if (interData.getFQty().compareTo(BigDecimal.ZERO) == 0) {
                        waitPakinService.delete(wrapper);
                        JSONObject object = new JSONObject();
                        object.put("Fnumber", interData.getFnumber());
                        object.put("FInterID", interData.getFInterID());
                        object.put("code", 200);
                        object.put("msg", "删除成功");
                        jsonArray.add(object);
                    } else {
                        waitPakin.setAnfme(interData.getFQty().doubleValue());
                        waitPakinService.update(waitPakin, wrapper);
                        JSONObject object = new JSONObject();
                        object.put("Fnumber", interData.getFnumber());
                        object.put("FInterID", interData.getFInterID());
                        object.put("code", 200);
                        object.put("msg", "修改成功");
                        jsonArray.add(object);
                    }

                } else {
                    JSONObject object = new JSONObject();
                    object.put("FInterID", interData.getFInterID());
                    object.put("Fnumber", interData.getFnumber());
                    object.put("code", 500);
                    object.put("msg", "已在入库中，无法取消");
                    jsonArray.add(object);
                }
            }

            //成品出庫
            if (interData.getIoType() == 3) {
                Wrapper wrapper1 = new EntityWrapper<OutStockBillEntry>().eq("FInterID", interData.getFInterID()).and().eq("Fnumber", interData.getFnumber());
                OutStockBillEntry outStockBillEntry = outStockService.selectOne(wrapper1);
@@ -114,6 +189,7 @@
                        jsonArray.add(object);
                    } else {
                        outStockBillEntry.setFAuxQty(interData.getFQty());
                        outStockBillEntry.setFQty(interData.getFQty());
                        outStockService.update(outStockBillEntry, wrapper1);
                        JSONObject object = new JSONObject();
                        object.put("Fnumber", interData.getFnumber());