销售收款接口增加组织

jnpf-java-boot/jnpf-scm/jnpf-scm-controller/src/main/java/jnpf/controller/YunguanInterfaceController.java

@@ -756,10 +756,32 @@ public class YunguanInterfaceController {
         System.out.println(str);
         YunguanSaleCollectionModel yunguanSaleCollectionModel = JsonUtil.getJsonToBean(str, YunguanSaleCollectionModel.class);
         CwSaleCollectionEntity cwSaleCollectionEntity =  new CwSaleCollectionEntity();
-        cwSaleCollectionEntity.setId(yunguanSaleCollectionModel.getID()); //收款单号
-        cwSaleCollectionEntity.setCompCd(yunguanSaleCollectionModel.getCOMP_CD()); //付款方
-        cwSaleCollectionEntity.setOrgId(yunguanSaleCollectionModel.getORG_ID()); //收款金额
-        cwSaleCollectionEntity.setDepartmentCd(yunguanSaleCollectionModel.getDEPARTMENT_CD()); //收款时间
+        cwSaleCollectionEntity.setId(yunguanSaleCollectionModel.getID()); //ID
+        if (StringUtils.isNotEmpty(yunguanSaleCollectionModel.getCOMP_CD())) {
+            cwSaleCollectionEntity.setCompCd(yunguanSaleCollectionModel.getCOMP_CD());
+            QueryWrapper<OrganizeEntity> organizeQueryWrapper = new QueryWrapper<>();
+            organizeQueryWrapper.lambda().eq(OrganizeEntity::getEnCode,yunguanSaleCollectionModel.getCOMP_CD());
+            organizeQueryWrapper.lambda().eq(OrganizeEntity::getEnabledMark,"1");
+            organizeQueryWrapper.lambda().isNull(OrganizeEntity::getDeleteMark);
+            OrganizeEntity organizeEntity = organizeService.getOne(organizeQueryWrapper);
+            if (ObjectUtil.isNotEmpty(organizeEntity)){
+                cwSaleCollectionEntity.setCompanyId(organizeEntity.getId()); //公司id
+            }
+        }
+        cwSaleCollectionEntity.setOrgId(yunguanSaleCollectionModel.getORG_ID());
+        if (StringUtils.isNotEmpty(yunguanSaleCollectionModel.getDEPARTMENT_CD())) {
+            cwSaleCollectionEntity.setDepartmentCd(yunguanSaleCollectionModel.getDEPARTMENT_CD());
+            QueryWrapper<OrganizeEntity> deptQueryWrapper = new QueryWrapper<>();
+            deptQueryWrapper.lambda().eq(OrganizeEntity::getEnCode,yunguanSaleCollectionModel.getDEPARTMENT_CD());
+            deptQueryWrapper.lambda().eq(OrganizeEntity::getEnabledMark,"1");
+            deptQueryWrapper.lambda().isNull(OrganizeEntity::getDeleteMark);
+            OrganizeEntity organizeEntity = organizeService.getOne(deptQueryWrapper);
+            if (ObjectUtil.isNotEmpty(organizeEntity)){
+                cwSaleCollectionEntity.setDepartmentId(organizeEntity.getId()); //部门id
+                List<String> strList = Arrays.asList(organizeEntity.getOrganizeIdTree().split(","));
+                cwSaleCollectionEntity.setOrganizeJsonId(JSON.toJSONString(strList)); //组织id
+            }
+        }
         cwSaleCollectionEntity.setPrepaymentNo(yunguanSaleCollectionModel.getPREPAYMENT_NO()); //收款方式
         cwSaleCollectionEntity.setPrepaymentSts(yunguanSaleCollectionModel.getPREPAYMENT_STS()); //备注
         cwSaleCollectionEntity.setCustCode(yunguanSaleCollectionModel.getCUST_CODE()); //制单人