feat: 设备管理优化-0513-申购、计划、合同、订单复制到设备管理

dev_kcyj
chenhc 1 year ago
parent 1c5e86da2d
commit 5e393ab5ab

@ -197,7 +197,7 @@ public class PurContractController {
public BaseResponse importPlan(@RequestBody PurPlanEntity purPlanEntity) {
if (purPlanEntity.getId() != null) {
purContractService.importPlan(purPlanEntity.getId());
purContractService.importPlan(purPlanEntity.getId(),purPlanEntity.getPageType());
} else {
return ResultVOUtils.error(999, "参数有误!");
}

@ -1,5 +1,6 @@
package com.glxp.api.req.purchase;
import com.baomidou.mybatisplus.annotation.TableField;
import com.glxp.api.util.page.ListPageRequest;
import lombok.Data;
@ -39,4 +40,7 @@ public class PurContractRequest extends ListPageRequest {
private Integer isGenerateOrder;
private Boolean sysApprovalFlow;
@TableField(value = "pageType")
private Integer pageType;
}

@ -79,7 +79,7 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
*
* @param id
*/
public void importPlan(Long id) {
public void importPlan(Long id,Integer pageType) {
PurPlanEntity purPlanEntity = purPlanDao.selectById(id);
PurPlanDetailRequest purApplyDetailRequest = new PurPlanDetailRequest();
purApplyDetailRequest.setOrderIdFk(String.valueOf(id));
@ -97,6 +97,7 @@ public class PurContractService extends ServiceImpl<PurContractMapper, PurContra
String code = gennerOrderUtils.createScOrderNo(new OrderNoTypeBean("HT", "yyyyMMdd"));
purContractEntity.setCode(code);
purContractEntity.setId(null);
purContractEntity.setPageType(pageType);
purContractMapper.insert(purContractEntity);
Long newId = purContractEntity.getId();

@ -144,6 +144,9 @@
<if test="purContractRequest.endDate != null and purContractRequest.endDate != ''">
AND pc.contractDate <![CDATA[<=]]> #{purContractRequest.endDate}
</if>
<if test="purContractRequest.pageType != null ">
AND pc.pageType = #{purContractRequest.pageType}
</if>
order by id desc
</where>

Loading…
Cancel
Save