|
@@ -7,20 +7,14 @@ import com.yh.saas.common.support.util.IdGenerator;
|
|
|
import com.yh.saas.common.support.util.StringUtils;
|
|
|
import com.yh.saas.plugin.base.service.ICommonBillOperateHisService;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.constant.StatusEnum;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractProcessInfo;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.entity.WarehouseBaseInfo;
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.entity.*;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.exception.YException;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.exception.YExceptionEnum;
|
|
|
import com.yh.saas.plugin.yiliangyiyun.mapper.ContractManagementInfoMapper;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.service.IContractGoodsInfoService;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.service.IContractProcessInfoService;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractGoodsInfo;
|
|
|
+import com.yh.saas.plugin.yiliangyiyun.service.*;
|
|
|
import com.google.common.collect.Lists;
|
|
|
import com.winsea.svc.base.security.util.AuthSecurityUtils;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.entity.ContractManagementInfo;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.service.IContractManagementInfoService;
|
|
|
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
|
|
|
-import com.yh.saas.plugin.yiliangyiyun.service.IWarehouseBaseInfoService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.apache.commons.httpclient.util.DateUtil;
|
|
@@ -61,6 +55,8 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
private IContractProcessInfoService contractProcessInfoService;
|
|
|
@Autowired
|
|
|
private IWarehouseBaseInfoService warehouseBaseInfoService;
|
|
|
+ @Autowired
|
|
|
+ private IWarehouseInOutInfoService warehouseInOutInfoService;
|
|
|
@Value("${file-root-path}")
|
|
|
private String localPath;
|
|
|
|
|
@@ -245,6 +241,17 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
|
|
|
ContractProcessInfo contractProcessInfo = contractProcessInfoService.selectOne(new EntityWrapper<ContractProcessInfo>().eq("contract_id", id));
|
|
|
contractGoodsInfoService.deleteById(contractGoodsInfo.getId());
|
|
|
contractProcessInfoService.deleteById(contractProcessInfo.getId());
|
|
|
+ if("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())){
|
|
|
+ //临时库信息
|
|
|
+ WarehouseBaseInfo warehouseBaseInfo = warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>().eq("warehouse_name", contractManagementInfo.getContractNo()));
|
|
|
+ warehouseBaseInfoService.deleteById(warehouseBaseInfo.getId());
|
|
|
+ //临时库出入库信息
|
|
|
+ List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>().eq("base_id",warehouseBaseInfo.getId()));
|
|
|
+ for(WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos ){
|
|
|
+ warehouseInOutInfoService.deleteById(warehouseInOutInfo.getId());
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|