生成合同时采购系统取值

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.java

@@ -77,4 +77,6 @@ public interface BasePurchaseSystemMapper extends BaseMapper<BasePurchaseSystem>
     List<BasePurchaseSystemDetailsVo> fetchOrgCodeByUseOrgSid(String useOrgSid);
 
     List<AppBasePurchSystemVo> fetchDetailsByUseOrgPath(String orgSid);
+
+    List<BasePurchaseSystem> selectByUseOrgSid(String useOrgSid);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemMapper.xml

@@ -27,4 +27,8 @@
     <select id="fetchDetailsByUseOrgPath" resultType="com.yxt.anrui.base.api.basepurchasesystem.AppBasePurchSystemVo">
         select * from base_purchase_system where useOrgSid = #{useOrgSid}
     </select>
+
+    <select id="selectByUseOrgSid" resultType="com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem">
+        select * from base_purchase_system where useOrgSid = #{useOrgSid}
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basepurchasesystem/BasePurchaseSystemService.java

@@ -152,4 +152,8 @@ public class BasePurchaseSystemService extends MybatisBaseService<BasePurchaseSy
 		List<AppBasePurchSystemVo> basePurchSystemVoList = baseMapper.fetchDetailsByUseOrgPath(orgSid);
 		return rb.success().setData(basePurchSystemVoList);
 	}
+
+	public List<BasePurchaseSystem> selectByUseOrgSid(String useOrgSid) {
+		return baseMapper.selectByUseOrgSid(useOrgSid);
+	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
+import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystem;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
 import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
@@ -15,6 +16,7 @@ import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeQuery;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractNodeVo;
 import com.yxt.anrui.base.api.commoncontract.flowable.CommonContractTaskQuery;
 import com.yxt.anrui.base.biz.basemodelszconfig.BaseModelSzconfigService;
+import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
 import com.yxt.anrui.base.biz.basetrailer.BaseTrailerService;
 import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
 import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
@@ -163,6 +165,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
 
     @Autowired
     private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
+    @Autowired
+    private BasePurchaseSystemService basePurchaseSystemService;
 
     private QueryWrapper<CommonContract> createQueryWrapper(CommonContractQuery query) {
         // todo: 这里根据具体业务调整查询条件
@@ -1650,13 +1654,23 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
             return rb.setMsg(resultBean.getMsg());
         }
         AppOrderDetailsVo appOrderDetailsVo = resultBean.getData();
+        //ToDo:排产，需采购
+        if("排产".equals(appOrderDetailsVo.getOrderType())){
+            //根据分公司sid查询采购系统，并取第一个
+            List<BasePurchaseSystem> systemList = basePurchaseSystemService.selectByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
+            systemList.removeAll(Collections.singleton(null));
+            if(systemList.size()>0){
+                BasePurchaseSystem basePurchaseSystem = systemList.get(0);
+                appOrderDetailsVo.setPurchaseSystemName(basePurchaseSystem.getPurchaseSystemName());
+                appOrderDetailsVo.setPurchaseSystemSid(basePurchaseSystem.getDeptSid());
+            }
+        }
         //甲方
         String createOrgName = appOrderDetailsVo.getSalesOrg();
         //乙方
         String customerName = appOrderDetailsVo.getName();
         //联系电话
         String mobile = appOrderDetailsVo.getPhone();
-        //身份证号
         //根据客户sid查询客户的身份证号
         sid = appOrderDetailsVo.getCustomerSid();
         ResultBean<CrmCustomerTempVo> crmResultBean = crmCustomerTempFeign.fetchSid(sid);
@@ -1668,7 +1682,6 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         String idNo = crmCustomerTempVo.getIDNumber();
         if (StringUtils.isBlank(idNo)) {
             return rb.setMessage(sid).setMsg("请先在客户洽谈的基础信息中补全客户的身份证号").setCode("515");
-//            return rb.setMsg("请先在客户洽谈的基础信息中补全客户的身份证号");
         }
         //查询销售订单的车型信息
         AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();