whycxzp
2022-09-15 788f57c0f36ce4e625b068b5891c35ed8f8da2c7
src/main/java/com/whyc/service/ProductHistoryService.java
@@ -83,7 +83,7 @@
    }
    //历史版本可用性设定
    @Transactional
    public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled, String reason) {
    public Response setpHistoryEnable(String parentCode, String customCode, int version, int enabled, String reason, String versionTime) {
        UpdateWrapper wrapper=new UpdateWrapper();
        wrapper.eq("parent_code",parentCode);
        wrapper.eq("custom_code",customCode);
@@ -127,10 +127,20 @@
            wrapper.eq("version",version);
            wrapper.set("enabled",0);
            flag=mapper.update(null,wrapper);
            if(flag>0){
            //3:prodcut中产品版本设置为-1
            UpdateWrapper uWrapper=new UpdateWrapper();
            uWrapper.eq("parent_code",parentCode);
            uWrapper.eq("custom_code",customCode);
            //设为不可用版本为-1
            uWrapper.set("version",-1);
            productMapper.update(null,uWrapper);
            /*if(flag>0){
                //
                QueryWrapper qWrapper=new QueryWrapper();
                qWrapper.eq("parent_code",parentCode);
                qWrapper.eq("custom_code",customCode);
                //1.查询当前product中的信息
                Product product=productMapper.selectOne(qWrapper);
@@ -147,7 +157,7 @@
                    productBomMapper.delete(bomWrapper);
                }
            }
            }*/
        }
        //锁定和解锁记录添加
@@ -156,13 +166,14 @@
            lockLog.setParentCode(parentCode);
            lockLog.setCustomCode(customCode);
            lockLog.setVersion(version);
            lockLog.setVersionTime(versionTime);
            lockLog.setReason(reason);
            lockLog.setOwner(ActionUtil.getUser().getName());
            lockLog.setCreateTime(new Date());
            if(enabled==0){ //锁定
                lockLog.setLock(1);
                lockLog.setLockFlag(1);
            }else{ //解锁
                lockLog.setLock(0);
                lockLog.setLockFlag(0);
            }
            lockLogService.insert(lockLog);
        }