change

kongzy

2024-07-01 47a751cb301d05276ae5d75145d57b2d090fe4e1

 src/main/java/com/nanometer/smartlab/service/SysWarehouseServiceImpl.java

@@ -92,7 +92,7 @@
    }

    @Transactional(propagation = Propagation.REQUIRED)
    public SysWarehouse getSysWarehouse(String id) {
    public SysWarehouse getSysWarehouse(Long id) {
        try {
            return this.sysWarehouseDao.getSysWarehouse(id);
        } catch (DataAccessException e) {
@@ -104,9 +104,9 @@
    @Transactional(propagation = Propagation.REQUIRED)
    public SysWarehouse insertSysWarehouse(SysWarehouse sysWarehouse) {
        try {
            if (sysWarehouse.getId() == null) {
                sysWarehouse.setId(IDUtils.uuid());
            }
//            if (sysWarehouse.getId() == null) {
//                sysWarehouse.setId(IDUtils.uuid());
//            }
            this.sysWarehouseDao.insertSysWarehouse(sysWarehouse);
            return sysWarehouse;
        } catch (DuplicateKeyException ex) {
@@ -149,7 +149,7 @@
                return false;
            }

            List<String> ids = new ArrayList<String>();
            List<Long> ids = new ArrayList<Long>();
            for (SysWarehouse sysWarehouse : sysWarehouseList) {
                ids.add(sysWarehouse.getId());
            }
@@ -173,7 +173,7 @@
   }

   @Transactional(propagation = Propagation.REQUIRED)
    public boolean isSysWarehouseExist(String barCode, String editId) {
    public boolean isSysWarehouseExist(String barCode, Long editId) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("barCode", barCode);
@@ -193,7 +193,7 @@
    }

    @Override
    @Transactional
    @Transactional(propagation = Propagation.REQUIRED)
    public void putInWarehouse(InWarehouseInfoDto inWarehouseInfo) throws Exception {
        List<String> codes = inWarehouseInfo.getReagentCode();
        if (codes !=null && codes.size()>0){
@@ -232,8 +232,8 @@
                BaseMeta meta = baseMetaService.getBaseMeta("reagent_character", null, dangerousInfo);
                BaseMeta baseMeta = new BaseMeta();
                if (meta == null){
                    baseMeta.setId(IDUtils.uuid());
                    baseMeta.setGroupId("reagent_character");
                 //   baseMeta.setId(IDUtils.uuid());
                    baseMeta.setGroupCode("reagent_character");
                    baseMeta.setValidFlag(ValidFlag.VALID);
                    baseMeta.setMetaValue(dangerousInfo);
                    baseMeta.setMetaKey(dangerousInfo);
@@ -249,34 +249,34 @@
                    OpeReagentStatus ors = new OpeReagentStatus();
                if (reagent != null &&reagent.size()>0){
                    //存在试剂
                    String reagentId = reagent.get(0).getId();
                    Long reagentId = reagent.get(0).getId();
                    ors.setReagentId(reagentId);

                }else{
                    //试剂不存在
                    SysReagent sr = new SysReagent();
                    sr.setId(IDUtils.uuid());
                 //   sr.setId(IDUtils.uuid());
                    sr.setCas(cas);
                    sr.setName(reagentName);
                    sr.setProductHome(factory.getId());
                    sr.setReagentFormat(specifications.getId());
                    sr.setReagentUnit(packing.getId());
                    //危险性质
                    sr.setReagentCharacter(baseMeta.getId());
                //    sr.setProductHome(factory.getId());
//                    sr.setReagentFormat(specifications.getId());
//                    sr.setReagentUnit(packing.getId());
//                    //危险性质
//                    sr.setReagentCharacter(baseMeta.getId());
                    //设备生成试剂类型 为3
                    sr.setType(3);
                    sr.setDangerousFlag(DangerousFlag.NORMAL);
                    SysReagent sysReagent = sysReagentService.insertSysReagent(sr);
                    String reagentId = sysReagent.getId();
                    Long reagentId = sysReagent.getId();
                    ors.setReagentId(reagentId);
                }

                ors.setId(IDUtils.uuid());
              //  ors.setId(IDUtils.uuid());
                //入仓库
                ors.setStatus(ArrivalStatus.WAREHOUSE);
                ors.setStatus(ArrivalStatus.WAREHOUSE.getKey());
                //批号
                ors.setArticleNumber(inWarehouseInfo.getArticleNumber());
                ors.setValidFlag(ValidFlag.VALID);
                ors.setValidFlag(ValidFlag.VALID.getKey());
                ors.setContainerId(inWarehouseInfo.getContainerId());
                ors.setHouseId(inWarehouseInfo.getWarehouseId());
                ors.setUserId(inWarehouseInfo.getUser());
@@ -286,18 +286,14 @@
                //更新试剂流向
                OpeUseFlow opeUseFlow = new OpeUseFlow();
                //入仓库
                opeUseFlow.setStatus(ArrivalStatus.WAREHOUSE);
                opeUseFlow.setStatus(ArrivalStatus.WAREHOUSE.getKey());
                opeUseFlow.setContainerId(inWarehouseInfo.getContainerId());
                opeUseFlow.setHouseId(inWarehouseInfo.getWarehouseId());
                opeUseFlow.setStoreType(StoreType.DIRECTSTORE);
                opeUseFlow.setStoreType(StoreType.DIRECTSTORE.getKey());
                opeUseFlow.setReagentCode(code);
                //持有者
                opeUseFlow.setUserId(inWarehouseInfo.getUser());
                Map<String, String> metaMap = new HashMap<>();
                metaMap.put("groupId", "operate_status");
                metaMap.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEIN.getKey()));
                List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
                opeUseFlow.setOperateState(baseMetaList.get(0).getId());
                opeUseFlow.setOperateState(OperateStatus.WAREHOUSEIN.getKey());
                opeUseFlowService.insertOpeUseFlow(opeUseFlow);

                //更新仓库库存
@@ -310,11 +306,11 @@
                    opeWarehouseReserve.setArticleNumber(inWarehouseInfo.getArticleNumber());
                    opeWarehouseReserve.setReserve(0);
                    opeWarehouseReserve.setWarehouseId(inWarehouseInfo.getWarehouseId());
                    opeWarehouseReserve.setUserId("admin");
                    opeWarehouseReserve.setUserId(1L);
                }
                //库存加1
                opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() + 1);
                if (StringUtils.isBlank(opeWarehouseReserve.getId())) {
                if (opeWarehouseReserve.getId()!=null) {
                    this.opeWarehouseReserveService.insertOpeWarehouseReserve(opeWarehouseReserve);
                } else {
                    this.opeWarehouseReserveService.updateOpeWarehouseReserve(opeWarehouseReserve);
@@ -326,8 +322,11 @@
    }

    @Override
    @Transactional
    @Transactional(propagation = Propagation.REQUIRED)
    public void reagentReceiving(ReagentReceivingDto reagentReceiving) {



        String number = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
        String receiptNum = "BS" + number;

@@ -347,7 +346,7 @@
                opeWarehouseReserve.setReserve(opeWarehouseReserve.getReserve() - 1);
                opeWarehouseReserveService.updateOpeWarehouseReserve(opeWarehouseReserve);
            }
            ors.setStatus(ArrivalStatus.NOREGISTER);
            ors.setStatus(ArrivalStatus.NOREGISTER.getKey());
            opeReagentStatusDao.updateOpeReagentStatusDao(ors);
            OpeUseFlow opeUseFlow = new OpeUseFlow();
            opeUseFlow.setReagentCode(ors.getReagentCode());
@@ -360,11 +359,8 @@
            //新增 领用单号
            opeUseFlow.setReceiptNumber(receiptNum);

            Map<String, String> metaMap = new HashMap<>();
            metaMap.put("groupId", "operate_status");
            metaMap.put("metaKey", String.valueOf(OperateStatus.WAREHOUSEOUT.getKey()));
            List<BaseMeta> baseMetaList = baseMetaDao.getBaseMetaList(metaMap);
            opeUseFlow.setOperateState(baseMetaList.get(0).getId());

            opeUseFlow.setOperateState(OperateStatus.WAREHOUSEOUT.getKey());
            this.opeUseFlowService.insertOpeUseFlow(opeUseFlow);

        });