分架新增界面玻璃总数量和查询界面玻璃总数量不一致

chenlu

117 分钟以前 42ced7220d64b42c0bf2b1a779c0f20d3da2a952

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

@@ -2,10 +2,12 @@

import com.baomidou.dynamic.datasource.annotation.DS;
import com.example.erp.entity.mm.MaterialStore;
import com.example.erp.entity.userInfo.Log;
import com.example.erp.entity.userInfo.SysError;
import com.example.erp.mapper.mm.BasicWarehouseTypeMapper;
import com.example.erp.mapper.mm.MaterialInventoryMapper;
import com.example.erp.mapper.mm.MaterialStoreMapper;
import com.example.erp.service.userInfo.LogService;
import com.example.erp.service.userInfo.SysErrorService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,6 +29,8 @@
    BasicWarehouseTypeMapper basicWarehouseTypeMapper;
    @Autowired
    SysErrorService sysErrorService;
    @Autowired
    LogService logService;

    public String saveMaterialStore(Map<String,Object> object) {
        String saveState = "true";
@@ -54,6 +58,12 @@
            if (object.get("height") != null) {
                height = Double.parseDouble(object.get("height").toString());
            }

            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());

            DecimalFormat decimalFormat = new DecimalFormat("#0.00");
            singlePieceArea= Double.parseDouble(decimalFormat.format(width * height / 100000));
            Integer jsonCount=materialStoreMapper.selectMaterialStoreJson(json);
@@ -63,12 +73,15 @@
                    if (Objects.equals(type, "原片")){
                        materialInventoryMapper.updateMaterialInventoryArea(Long.valueOf(id),singlePieceArea);
                    }
                    log.setFunction("saveMaterialStore修改");
                }else{
                    materialStoreMapper.insertMaterialStore(type,json);
                    log.setFunction("saveMaterialStore新增");
                }
            }else{
                saveState = "false1";
            }
            logService.saveLog(log);

        } catch (Exception e) {
            TransactionAspectSupport.currentTransactionStatus().rollbackToSavepoint(savePoint);
@@ -93,6 +106,14 @@
        return map;
    }

    public Map<String, Object> getSelectMaterialStores(MaterialStore materialStore) {


        Map<String, Object> map = new HashMap<>();
        map.put("data", materialStoreMapper.getSelectMaterialStores(materialStore));
        return map;
    }

    public String deleteMaterialStore(Map<String,Object> object) {
        String saveState = "true";
        //设置回滚点
@@ -111,6 +132,12 @@
                }

            }
            Log log = new Log();
            log.setOperatorId(object.get("userId").toString());
            log.setOperator(object.get("userName").toString());
            log.setContent(object.toString());
            log.setFunction("deleteMaterialStore删除："+id);
            logService.saveLog(log);