From 9c56779e1f687c06b31a7bd74418833f08235b53 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 17 十一月 2022 00:59:37 +0800
Subject: [PATCH] 加入供应商配置
---
service-scm/src/main/java/com/java110/scm/cmd/supplierType/ListSupplierConfigCmd.java | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/service-scm/src/main/java/com/java110/scm/cmd/supplierType/ListSupplierConfigCmd.java b/service-scm/src/main/java/com/java110/scm/cmd/supplierType/ListSupplierConfigCmd.java
index 458a5b9..9c5a92c 100644
--- a/service-scm/src/main/java/com/java110/scm/cmd/supplierType/ListSupplierConfigCmd.java
+++ b/service-scm/src/main/java/com/java110/scm/cmd/supplierType/ListSupplierConfigCmd.java
@@ -22,7 +22,11 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.dto.supplier.SupplierDto;
+import com.java110.dto.supplierKey.SupplierKeyDto;
import com.java110.intf.scm.ISupplierConfigV1InnerServiceSMO;
+import com.java110.intf.scm.ISupplierKeyV1InnerServiceSMO;
+import com.java110.intf.scm.ISupplierV1InnerServiceSMO;
import com.java110.po.supplierConfig.SupplierConfigPo;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -55,9 +59,16 @@
@Autowired
private ISupplierConfigV1InnerServiceSMO supplierConfigV1InnerServiceSMOImpl;
+ @Autowired
+ private ISupplierKeyV1InnerServiceSMO supplierKeyV1InnerServiceSMOImpl;
+
+ @Autowired
+ private ISupplierV1InnerServiceSMO supplierV1InnerServiceSMOImpl;
+
@Override
public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
super.validatePageInfo(reqJson);
+ Assert.hasKeyAndValue(reqJson,"supplierId","鏈寘鍚緵搴斿晢");
}
@Override
@@ -72,7 +83,7 @@
if (count > 0) {
supplierConfigDtos = supplierConfigV1InnerServiceSMOImpl.querySupplierConfigs(supplierConfigDto);
} else {
- supplierConfigDtos = new ArrayList<>();
+ supplierConfigDtos = getSupplierKey(supplierConfigDto);
}
ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, supplierConfigDtos);
@@ -81,4 +92,37 @@
cmdDataFlowContext.setResponseEntity(responseEntity);
}
+
+ /**
+ * 鏌ヨ
+ * @param supplierConfigDto
+ * @return
+ */
+ private List<SupplierConfigDto> getSupplierKey(SupplierConfigDto supplierConfigDto) {
+
+ SupplierDto supplierDto = new SupplierDto();
+ supplierDto.setSupplierId(supplierConfigDto.getSupplierId());
+ List<SupplierDto> supplierDtos = supplierV1InnerServiceSMOImpl.querySuppliers(supplierDto);
+
+ Assert.listOnlyOne(supplierDtos,"鏈寘鍚緵搴斿晢");
+
+ SupplierKeyDto supplierKeyDto = new SupplierKeyDto();
+ supplierKeyDto.setBeanName(supplierDtos.get(0).getBeanName());
+ List<SupplierKeyDto> supplierKeyDtos = supplierKeyV1InnerServiceSMOImpl.querySupplierKeys(supplierKeyDto);
+
+ Assert.listOnlyOne(supplierDtos,"鏈寘鍚緵搴斿晢妯℃澘閰嶇疆");
+
+ List<SupplierConfigDto> supplierConfigDtos = new ArrayList<>();
+ SupplierConfigDto supplierConfigDto1 = null;
+ for(SupplierKeyDto supplierKeyDto1:supplierKeyDtos){
+ supplierConfigDto1 = new SupplierConfigDto();
+ supplierConfigDto1.setSupplierId(supplierConfigDto.getSupplierId());
+ supplierConfigDto1.setColumnKey(supplierKeyDto1.getColumnKey());
+ supplierConfigDto1.setColumnValue("");
+ supplierConfigDto1.setName(supplierKeyDto1.getName());
+ supplierConfigDto1.setRemark(supplierKeyDto1.getRemark());
+ supplierConfigDtos.add(supplierConfigDto1);
+ }
+ return supplierConfigDtos;
+ }
}
--
Gitblit v1.8.0