采购单申请调整

选择供应商接口开发

yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java

@@ -89,9 +89,9 @@ public class PmsSupplierInfoRest {
 
 	@ApiOperation("选择供应商")
 	@PostMapping("/choiceSupplierInfo")
-	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("createOrgSid") String createOrgSid){
+	public ResultBean<List<PmsSupplierInfoChoice>> choiceSupplierInfo(@RequestParam("orgPath") String orgPath){
 		ResultBean rb = ResultBean.fireFail();
-		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(createOrgSid);
+		List<PmsSupplierInfoChoice> baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgPath);
 		return rb.success().setData(baseSupplierInfoChoiceList);
 	}
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillDetailsVo.java

@@ -66,6 +66,12 @@ public class PmsPurchaseBillDetailsVo implements Vo {
 
     @ApiModelProperty("备注")
     private String remarks;
+    @ApiModelProperty("申请日期")
+    @JsonFormat(
+            pattern = "yyyy-MM-dd",
+            timezone = "GMT+8"
+    )
+    private Date createTime;
     @ApiModelProperty("制单人sid")
     private String createBySid;
 	@ApiModelProperty("制单人姓名")
@@ -104,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String purchaserName;
     @ApiModelProperty("预计到货日期")
     @JsonFormat(
-            pattern = "yyyy-MM-dd HH:mm:ss",
+            pattern = "yyyy-MM-dd",
             timezone = "GMT+8"
     )
     private Date deliveryDate;
@@ -129,7 +135,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierBank/PmsSupplierBankChoice.java

@@ -0,0 +1,43 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.pms.biz.pms.pmssupplierBank;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "供应商开户行信息", description = "供应商开户行信息")
+public class PmsSupplierBankChoice extends BaseEntity {
+
+	@ApiModelProperty("开户行")
+    private String bankName;
+	@ApiModelProperty("开户行帐号")
+    private String bankAccount;
+	@ApiModelProperty("账户名称")
+    private String accountName;
+}

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoChoice.java

@@ -27,10 +27,14 @@ package com.yxt.pms.biz.pms.pmssupplierinfo;
 
 
 import com.yxt.common.core.vo.Vo;
+import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankChoice;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+import java.util.List;
+
 /**
  * Project: yxt-base(供应商管理) <br/>
  * File: BaseSupplierInfoVo.java <br/>
@@ -51,4 +55,13 @@ public class PmsSupplierInfoChoice implements Vo {
     private String sid;
     @ApiModelProperty("供应商名称")
     private String supplierName;
+    @ApiModelProperty("开票类型key")
+    private String billingTypeKey;
+    @ApiModelProperty("开票类型value")
+    private String billingTypeValue;
+    @ApiModelProperty("税率")
+    private BigDecimal taxRate;
+
+    @ApiModelProperty("开户行信息")
+    private List<PmsSupplierBankChoice> supplierBankChoices;
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java

@@ -62,7 +62,7 @@ public interface PmsSupplierInfoMapper extends BaseMapper<PmsSupplierInfo> {
 	@Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}")
     int updateBySidIsDelete(String sid);
 
-	@Select("select * from yxt_base.base_supplier_info")
+	@Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid}")
     List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid);
 
 	@Select("select * from yxt_base.base_supplier_info where sid = #{sid}")

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java

@@ -30,13 +30,11 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBank;
+import com.yxt.pms.biz.pms.pmssupplierBank.*;
-import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankDetailsVo;
-import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankDto;
-import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankService;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
+import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto;
 import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto;
 import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign;
@@ -67,6 +65,8 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 	private PmsSupplierBankService pmsSupplierBankService;
 	@Autowired
 	private BaseSupplierInfoFeign baseSupplierInfoFeign;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
 
 	public PagerVo<PmsSupplierInfoVo> listPageVo(PagerQuery<PmsSupplierInfoQuery> pq) {
 		PmsSupplierInfoQuery query = pq.getParams();
@@ -142,8 +142,23 @@ public class PmsSupplierInfoService extends MybatisBaseService<PmsSupplierInfoMa
 		}
 	}
 
-	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String createOrgSid) {
+	public List<PmsSupplierInfoChoice> choiceSupplierInfo(String orgPath) {
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
 		List<PmsSupplierInfoChoice> pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(createOrgSid);
+		for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) {
+			List<PmsSupplierBankChoice> pmsSupplierBankChoices = new ArrayList<>();
+			List<PmsSupplierBankDetailsVo> pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid());
+			if (pmsSupplierBankDetailsVos != null && pmsSupplierBankDetailsVos.size() > 0){
+				for (PmsSupplierBankDetailsVo pmsSupplierBankDetailsVo : pmsSupplierBankDetailsVos) {
+					PmsSupplierBankChoice pmsSupplierBankChoice = new PmsSupplierBankChoice();
+					pmsSupplierBankChoice.setBankName(pmsSupplierBankDetailsVo.getBankName());
+					pmsSupplierBankChoice.setBankAccount(pmsSupplierBankDetailsVo.getBankAccount());
+					pmsSupplierBankChoice.setAccountName(pmsSupplierBankDetailsVo.getAccountName());
+					pmsSupplierBankChoices.add(pmsSupplierBankChoice);
+				}
+			}
+			pmsSupplierInfoChoice.setSupplierBankChoices(pmsSupplierBankChoices);
+		}
 		return pmsSupplierInfoChoiceList;
 	}
 }