提交浏览发货信息

廖井涛

5 天以前 4955996ab044bc275ac78da3543b9d9f5ad7f8d9

 north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGlassShelfService.java

@@ -57,9 +57,18 @@
                userName = object.get("userName").toString();
            }

            String inventoryArea = "";
            if (object.get("inventoryArea") != null) {
                inventoryArea = object.get("inventoryArea").toString();
            }

            int quantity = 0;
            if (object.get("quantity") != null) {
                quantity = Integer.valueOf(object.get("quantity").toString());
            }

            FinishedGlassShelfInformation finishedGlassShelfInformation =
                    JSONObject.parseObject(JSONObject.toJSONString(object.get("title")), FinishedGlassShelfInformation.class);
            finishedGlassShelfInformation.setMoney(finishedGlassShelfInformation.getPrice()*finishedGlassShelfInformation.getTotalQuantity());

            List<FinishedGlassShelfInformation> finishedGlassShelfInformationList=finishedGlassShelfMapper
                    .getSelectFinishedGlassShelfInformation(finishedGlassShelfInformation);
@@ -68,24 +77,16 @@
                finishedGlassShelfMapper.updateFinishedGlassShelfInformation(finishedGlassShelfInformation,finishedGlassShelfInformation.getId());
                log.setFunction("saveFinishedGlassShelf修改1");
            }else{
                if(finishedGlassShelfInformationList.size()==0){
                    finishedGlassShelfMapper.insetFinishedGlassShelfInformation(finishedGlassShelfInformation);
                    log.setFunction("saveFinishedGlassShelf新增");
                }else if(finishedGlassShelfInformationList.size()==1){
                    finishedGlassShelfMapper.updateFinishedGlassShelfInformationQuantity(finishedGlassShelfInformation.getTotalQuantity(),finishedGlassShelfInformationList.get(0).getId());
                    log.setFunction("saveFinishedGlassShelf修改2");
                }else{
                    saveState = "false";
                int index=finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInventoryArea(inventoryArea);
                for (int i=1;i<=quantity;i++){
                    index++;
                    finishedGlassShelfMapper.insetFinishedGlassShelfInformation(finishedGlassShelfInformation,inventoryArea+index);
                }
                log.setFunction("saveFinishedGlassShelf新增");

                if(saveState.equals("true")){
                    finishedGlassShelfMapper.insetFinishedGlassShelfLog(finishedGlassShelfInformation);
                }
                finishedGlassShelfMapper.insetFinishedGlassShelfLog(finishedGlassShelfInformation,quantity);

            }





            logService.saveLog(log);

@@ -103,11 +104,16 @@

    }

    public Map<String, Object> getSelectFinishedGlassShelfInformation(Integer pageNum, Integer pageSize) {
    public Map<String, Object> getSelectFinishedGlassShelfInformation(Integer pageNum, Integer pageSize,String type) {
        Integer offset = (pageNum - 1) * pageSize;
        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDate(offset, pageSize));
        map.put("total", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDatePageTotal(offset, pageSize));
        if(type.equals("1")){
            map.put("data", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDate(offset, pageSize));
            map.put("total", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDatePageTotal(offset, pageSize));
        }else{
            map.put("data", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDateDetail(offset, pageSize));
            map.put("total", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationDateDetailPageTotal(offset, pageSize));
        }
        return map;
    }

@@ -153,17 +159,22 @@

    }

    public Map<String, Object> getSelectFinishedGlassShelfInformationDetails(Integer pageNum, Integer pageSize, String ids) {
        if (ids.startsWith("\"") && ids.endsWith("\"")) {
            ids = ids.substring(1, ids.length() - 1); // 去除首尾引号
        }
        List<Long> id=new ArrayList<>();;
        if(ids!=null && !ids.isEmpty()){
            List<String> result = StrUtil.split(ids, '|');
            id=result.stream().map(Long::valueOf).collect(Collectors.toList());
        }
    public Map<String, Object> getSelectFinishedGlassShelfInformationDetails(Integer pageNum, Integer pageSize, List<Map<String, Object>> object) {

        Map<String, Object> map = new HashMap<>();
        map.put("data", finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInId(id));
        List<Map<String, Object>> mapList=new ArrayList<>();
        for(Map<String, Object> objectMap:object){
            mapList.add(finishedGlassShelfMapper.getSelectFinishedGlassShelfInformationInId(
                    objectMap.get("glassShelfName").toString(),
                    Double.parseDouble(objectMap.get("price").toString()),
                    objectMap.get("unit").toString(),
                    Double.parseDouble(objectMap.get("weight").toString()),
                    Double.parseDouble(objectMap.get("width").toString()),
                    Double.parseDouble(objectMap.get("height").toString())
            ));

        }
        map.put("data", mapList);
        return map;
    }

@@ -207,9 +218,16 @@
                List<FinishedGlassShelfEmitDetails> finishedGlassShelfEmitDetailsList2 = finishedGlassShelfMapper.getSelectFinishedGlassShelfEmitDetailsByemitId1(emitId);
                if (!finishedGlassShelfEmitDetailsList2.isEmpty()) {
                    for (FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails : finishedGlassShelfEmitDetailsList2) {
                        finishedGlassShelfMapper.updateInformationAvailableQuantityInt(finishedGlassShelfEmitDetails);
                        finishedGlassShelfMapper.updateInformationAvailableQuantityInt(
                                finishedGlassShelfEmitDetails.getMaxWeight(),
                                finishedGlassShelfEmitDetails.getMaxWidth(),
                                finishedGlassShelfEmitDetails.getMaxHeight(),
                                finishedGlassShelfEmitDetails.getQuantity(),
                                finishedGlassShelfEmitDetails.getPrice(),
                                finishedGlassShelfEmitDetails.getUnit(),
                                finishedGlassShelfEmitDetails.getGlassShelfName());
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(emitId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
                    }
                }

@@ -229,19 +247,29 @@
                int index=1;
                for (FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails:finishedGlassShelfEmitDetailsList){
                    finishedGlassShelfEmitDetails.setMoney(finishedGlassShelfEmitDetails.getPrice()*finishedGlassShelfEmitDetails.getQuantity());
                    finishedGlassShelfMapper.updateInformationAvailableQuantityOut(finishedGlassShelfEmitDetails);
                    finishedGlassShelfMapper.updateInformationAvailableQuantityOut(
                            finishedGlassShelfEmitDetails.getMaxWeight(),
                            finishedGlassShelfEmitDetails.getMaxWidth(),
                            finishedGlassShelfEmitDetails.getMaxHeight(),
                            finishedGlassShelfEmitDetails.getQuantity(),
                            finishedGlassShelfEmitDetails.getPrice(),
                            finishedGlassShelfEmitDetails.getUnit(),
                            finishedGlassShelfEmitDetails.getGlassShelfName());
                    finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetails(oddNumber,index,finishedGlassShelfEmitDetails);
                    finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
                            oddNumber,
                            index,
                            1,
                            finishedGlassShelfEmitDetails.getGlassShelfNumber(),
                            finishedGlassShelfEmitDetails.getGlassShelfName(),
                            finishedGlassShelfEmitDetails.getQuantity(),
                            finishedGlassShelfEmitDetails.getPrice(),
                            finishedGlassShelfEmitDetails.getMoney(),
                            finishedGlassShelfEmitDetails.getUnit(),
                            finishedGlassShelfEmitDetails.getRemarks()
                            finishedGlassShelfEmitDetails.getRemarks(),
                            finishedGlassShelfEmitDetails.getMaxWeight(),
                            finishedGlassShelfEmitDetails.getMaxWidth(),
                            finishedGlassShelfEmitDetails.getMaxHeight(),
                            finishedGlassShelfEmitDetails.getGlassShelfName(),
                            object.get("userName").toString()
                    );
                    index++;
                }
@@ -306,7 +334,14 @@
                    List<FinishedGlassShelfEmitDetails> finishedGlassShelfEmitDetailsList2 = finishedGlassShelfMapper.getSelectFinishedGlassShelfEmitDetailsByemitId1(emitId);
                    if (!finishedGlassShelfEmitDetailsList2.isEmpty()) {
                        for (FinishedGlassShelfEmitDetails finishedGlassShelfEmitDetails : finishedGlassShelfEmitDetailsList2) {
                            finishedGlassShelfMapper.updateInformationAvailableQuantityInt(finishedGlassShelfEmitDetails);
                            finishedGlassShelfMapper.updateInformationAvailableQuantityInt(
                                    finishedGlassShelfEmitDetails.getMaxWeight(),
                                    finishedGlassShelfEmitDetails.getMaxWidth(),
                                    finishedGlassShelfEmitDetails.getMaxHeight(),
                                    finishedGlassShelfEmitDetails.getQuantity(),
                                    finishedGlassShelfEmitDetails.getPrice(),
                                    finishedGlassShelfEmitDetails.getUnit(),
                                    finishedGlassShelfEmitDetails.getGlassShelfName());
                            finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(emitId);
                        }
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetails(emitId);
@@ -372,8 +407,17 @@
                if (!finishedGlassShelfWithdrawDetailsList2.isEmpty()) {
                    for (FinishedGlassShelfWithdrawDetails finishedGlassShelfWithdrawDetails : finishedGlassShelfWithdrawDetailsList2) {
                        finishedGlassShelfMapper.updateEmitDetailsWithdrawQuantityOut(finishedGlassShelfWithdrawDetails);
                        finishedGlassShelfMapper.updateInformationAvailableQuantityOut(
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.deleteFinishedGlassShelfWithdrawDetails(withdrawId);
                        finishedGlassShelfMapper.updateFinishedGlassShelfEmitDetailsLog(withdrawId);
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
                    }
                }

@@ -395,18 +439,30 @@
                    if(finishedGlassShelfWithdrawDetails.getQuantity()>0){
                        finishedGlassShelfWithdrawDetails.setMoney(finishedGlassShelfWithdrawDetails.getPrice()*finishedGlassShelfWithdrawDetails.getQuantity());
                        finishedGlassShelfMapper.updateEmitDetailsWithdrawQuantityInt(finishedGlassShelfWithdrawDetails);
                        finishedGlassShelfMapper.updateInformationAvailableQuantityInt(
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.insertFinishedGlassShelfWithdrawDetails(oddNumber,index,finishedGlassShelfWithdrawDetails);
                        finishedGlassShelfMapper.insertFinishedGlassShelfEmitDetailsLog(
                                oddNumber,
                                index,
                                2,
                                finishedGlassShelfWithdrawDetails.getGlassShelfNumber(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName(),
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getMoney(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getRemarks()
                                finishedGlassShelfWithdrawDetails.getRemarks(),
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName(),
                                object.get("userName").toString()
                        );
                        index++;
                    }
@@ -500,6 +556,15 @@
                if (!finishedGlassShelfWithdrawDetailsList2.isEmpty()) {
                    for (FinishedGlassShelfWithdrawDetails finishedGlassShelfWithdrawDetails : finishedGlassShelfWithdrawDetailsList2) {
                        finishedGlassShelfMapper.updateEmitDetailsWithdrawQuantityOut(finishedGlassShelfWithdrawDetails);
                        finishedGlassShelfMapper.updateInformationAvailableQuantityOut(
                                finishedGlassShelfWithdrawDetails.getMaxWeight(),
                                finishedGlassShelfWithdrawDetails.getMaxWidth(),
                                finishedGlassShelfWithdrawDetails.getMaxHeight(),
                                finishedGlassShelfWithdrawDetails.getQuantity(),
                                finishedGlassShelfWithdrawDetails.getPrice(),
                                finishedGlassShelfWithdrawDetails.getUnit(),
                                finishedGlassShelfWithdrawDetails.getGlassShelfName()
                        );
                        finishedGlassShelfMapper.deleteFinishedGlassShelfEmitDetailsLog(withdrawId);
                    }