修改排产和厂家认款

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscription.java

@@ -48,165 +48,195 @@ import io.swagger.annotations.ApiModelProperty;
 public class BaseManufactorSubscription extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    
+    @ApiModelProperty("采购类型key")
-	@ApiModelProperty("打款状态")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
+
+    @ApiModelProperty("打款状态")
     private String paymentState; // 打款状态
-    
+
-	@ApiModelProperty("打款金额")
+    @ApiModelProperty("打款金额")
     private String paymentMoney; // 打款金额
-    
+
-	@ApiModelProperty("排产申请编号")
+    @ApiModelProperty("排产申请编号")
     private String proSchAppNo; // 排产申请编号
-    
+
-	@ApiModelProperty("认款日期")
+    @ApiModelProperty("认款日期")
     private String subscriptionDate; // 认款日期
-    
+
-	@ApiModelProperty("认款人")
+    @ApiModelProperty("认款人")
     private String subscriptionPeo; // 认款人
-    
+
-	@ApiModelProperty("见证材料")
+    @ApiModelProperty("见证材料")
     private String witMatUrl; // 见证材料
-    
+
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-    
+
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-    
+
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    
+
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
 
-	/**
+    /**
-	 * @return 打款状态
+     * @return 打款状态
-	 */
+     */
-	public String getPaymentState(){
+    public String getPaymentState() {
-		return paymentState;
+        return paymentState;
-	}
+    }
-	
+
-	/**
+    /**
-	 * @param paymentState 打款状态 to set
+     * @param paymentState 打款状态 to set
-	 */
+     */
-	public void setPaymentState(String paymentState){
+    public void setPaymentState(String paymentState) {
-		this.paymentState = paymentState;
+        this.paymentState = paymentState;
-	}
+    }
-	/**
+
-	 * @return 打款金额
+    /**
-	 */
+     * @return 打款金额
-	public String getPaymentMoney(){
+     */
-		return paymentMoney;
+    public String getPaymentMoney() {
-	}
+        return paymentMoney;
-	
+    }
-	/**
+
-	 * @param paymentMoney 打款金额 to set
+    /**
-	 */
+     * @param paymentMoney 打款金额 to set
-	public void setPaymentMoney(String paymentMoney){
+     */
-		this.paymentMoney = paymentMoney;
+    public void setPaymentMoney(String paymentMoney) {
-	}
+        this.paymentMoney = paymentMoney;
-	/**
+    }
-	 * @return 排产申请编号
+
-	 */
+    /**
-	public String getProSchAppNo(){
+     * @return 排产申请编号
-		return proSchAppNo;
+     */
-	}
+    public String getProSchAppNo() {
-	
+        return proSchAppNo;
-	/**
+    }
-	 * @param proSchAppNo 排产申请编号 to set
+
-	 */
+    /**
-	public void setProSchAppNo(String proSchAppNo){
+     * @param proSchAppNo 排产申请编号 to set
-		this.proSchAppNo = proSchAppNo;
+     */
-	}
+    public void setProSchAppNo(String proSchAppNo) {
-	/**
+        this.proSchAppNo = proSchAppNo;
-	 * @return 认款日期
+    }
-	 */
+
-	public String getSubscriptionDate(){
+    /**
-		return subscriptionDate;
+     * @return 认款日期
-	}
+     */
-	
+    public String getSubscriptionDate() {
-	/**
+        return subscriptionDate;
-	 * @param subscriptionDate 认款日期 to set
+    }
-	 */
+
-	public void setSubscriptionDate(String subscriptionDate){
+    /**
-		this.subscriptionDate = subscriptionDate;
+     * @param subscriptionDate 认款日期 to set
-	}
+     */
-	/**
+    public void setSubscriptionDate(String subscriptionDate) {
-	 * @return 认款人
+        this.subscriptionDate = subscriptionDate;
-	 */
+    }
-	public String getSubscriptionPeo(){
+
-		return subscriptionPeo;
+    /**
-	}
+     * @return 认款人
-	
+     */
-	/**
+    public String getSubscriptionPeo() {
-	 * @param subscriptionPeo 认款人 to set
+        return subscriptionPeo;
-	 */
+    }
-	public void setSubscriptionPeo(String subscriptionPeo){
+
-		this.subscriptionPeo = subscriptionPeo;
+    /**
-	}
+     * @param subscriptionPeo 认款人 to set
-	/**
+     */
-	 * @return 见证材料
+    public void setSubscriptionPeo(String subscriptionPeo) {
-	 */
+        this.subscriptionPeo = subscriptionPeo;
-	public String getWitMatUrl(){
+    }
-		return witMatUrl;
+
-	}
+    /**
-	
+     * @return 见证材料
-	/**
+     */
-	 * @param witMatUrl 见证材料 to set
+    public String getWitMatUrl() {
-	 */
+        return witMatUrl;
-	public void setWitMatUrl(String witMatUrl){
+    }
-		this.witMatUrl = witMatUrl;
+
-	}
+    /**
-	/**
+     * @param witMatUrl 见证材料 to set
-	 * @return 使用组织sid
+     */
-	 */
+    public void setWitMatUrl(String witMatUrl) {
-	public String getUseOrgSid(){
+        this.witMatUrl = witMatUrl;
-		return useOrgSid;
+    }
-	}
+
-	
+    /**
-	/**
+     * @return 使用组织sid
-	 * @param useOrgSid 使用组织sid to set
+     */
-	 */
+    public String getUseOrgSid() {
-	public void setUseOrgSid(String useOrgSid){
+        return useOrgSid;
-		this.useOrgSid = useOrgSid;
+    }
-	}
+
-	/**
+    /**
-	 * @return 使用组织名称
+     * @param useOrgSid 使用组织sid to set
-	 */
+     */
-	public String getUseOrgName(){
+    public void setUseOrgSid(String useOrgSid) {
-		return useOrgName;
+        this.useOrgSid = useOrgSid;
-	}
+    }
-	
+
-	/**
+    /**
-	 * @param useOrgName 使用组织名称 to set
+     * @return 使用组织名称
-	 */
+     */
-	public void setUseOrgName(String useOrgName){
+    public String getUseOrgName() {
-		this.useOrgName = useOrgName;
+        return useOrgName;
-	}
+    }
-	/**
+
-	 * @return 创建组织sid
+    /**
-	 */
+     * @param useOrgName 使用组织名称 to set
-	public String getCreateOrgSid(){
+     */
-		return createOrgSid;
+    public void setUseOrgName(String useOrgName) {
-	}
+        this.useOrgName = useOrgName;
-	
+    }
-	/**
+
-	 * @param createOrgSid 创建组织sid to set
+    /**
-	 */
+     * @return 创建组织sid
-	public void setCreateOrgSid(String createOrgSid){
+     */
-		this.createOrgSid = createOrgSid;
+    public String getCreateOrgSid() {
-	}
+        return createOrgSid;
-	/**
+    }
-	 * @return 创建组织名称
+
-	 */
+    /**
-	public String getCreateOrgName(){
+     * @param createOrgSid 创建组织sid to set
-		return createOrgName;
+     */
-	}
+    public void setCreateOrgSid(String createOrgSid) {
-	
+        this.createOrgSid = createOrgSid;
-	/**
+    }
-	 * @param createOrgName 创建组织名称 to set
+
-	 */
+    /**
-	public void setCreateOrgName(String createOrgName){
+     * @return 创建组织名称
-		this.createOrgName = createOrgName;
+     */
-	}
+    public String getCreateOrgName() {
+        return createOrgName;
+    }
+
+    /**
+     * @param createOrgName 创建组织名称 to set
+     */
+    public void setCreateOrgName(String createOrgName) {
+        this.createOrgName = createOrgName;
+    }
+
+    public String getApplyTypeKey() {
+        return applyTypeKey;
+    }
+
+    public void setApplyTypeKey(String applyTypeKey) {
+        this.applyTypeKey = applyTypeKey;
+    }
+
+    public String getApplyType() {
+        return applyType;
+    }
+
+    public void setApplyType(String applyType) {
+        this.applyType = applyType;
+    }
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionDto.java

@@ -62,4 +62,9 @@ public class BaseManufactorSubscriptionDto implements Dto {
     private String createOrgSid;
     @ApiModelProperty(value = "使用组织sid")
     private String useOrgSid;
+
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemanufactorsubscription/BaseManufactorSubscriptionVo.java

@@ -49,24 +49,27 @@ import lombok.Data;
 @Data
 public class BaseManufactorSubscriptionVo implements Vo {
 
-	@ApiModelProperty("sid")
+    @ApiModelProperty("sid")
-	private String sid; // sid
+    private String sid; // sid
-	@ApiModelProperty("状态")
+    @ApiModelProperty("状态")
-	private String state; // 状态
+    private String state; // 状态
-	@ApiModelProperty("打款状态")
+    @ApiModelProperty("打款状态")
     private String paymentState; // 打款状态
-	@ApiModelProperty("排产申请编号")
+    @ApiModelProperty("排产申请编号")
     private String proSchAppNo; // 排产申请编号
-	@ApiModelProperty("认款日期")
+    @ApiModelProperty("认款日期")
     private String subscriptionDate; // 认款日期
-	@ApiModelProperty("认款人")
+    @ApiModelProperty("认款人")
     private String subscriptionPeo; // 认款人
-	@ApiModelProperty("见证材料")
+    @ApiModelProperty("见证材料")
     private String witMatUrl; // 见证材料
-	@ApiModelProperty("备注")
+    @ApiModelProperty("备注")
-	private String remarks; // 备注
+    private String remarks; // 备注
-	@ApiModelProperty("是否显示通过(0不显示，1显示)")
+    @ApiModelProperty("是否显示通过(0不显示，1显示)")
-	private String isShowAdopt; // 是否显示通过
+    private String isShowAdopt; // 是否显示通过
-	@ApiModelProperty(value = "打款金额")
+    @ApiModelProperty(value = "打款金额")
-	private String paymentMoney;
+    private String paymentMoney;
+
+    @ApiModelProperty("厂家采购类型value")
+    private String applyType;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApply.java

@@ -6,8 +6,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.math.BigDecimal;
-
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: BusVehicleApply.java <br/>
@@ -58,4 +56,9 @@ public class BusVehicleApply extends BaseEntity {
     @ApiModelProperty(value = "分公司名称")
     private String createOrgName;
 
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDetailsVo.java

@@ -48,4 +48,7 @@ public class BusVehicleApplyDetailsVo implements Vo {
     private String createOrgName;
     @ApiModelProperty(value = "分公司sid")
     private String createOrgSid;
+
+    private String applyTypeKey;
+    private String applyType;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyDto.java

@@ -59,4 +59,9 @@ public class BusVehicleApplyDto implements Dto {
     @ApiModelProperty(value = "分公司名称")
     private String createOrgName;
 
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java

@@ -47,4 +47,9 @@ public class BusVehicleApplyVo implements Vo {
     @ApiModelProperty("流程实例id")
     private String procInstId;
 
+    @ApiModelProperty("采购类型key")
+    private String applyTypeKey;
+    @ApiModelProperty("采购类型value")
+    private String applyType;
+
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionService.java

@@ -35,9 +35,16 @@ import com.yxt.anrui.base.api.busvehicleapplydetail.BusVehicleApplyDetailVo;
 import com.yxt.anrui.base.api.busvehicleorder.BusVehicleOrderListDto;
 import com.yxt.anrui.base.biz.busvehicleapply.BusVehicleApplyService;
 import com.yxt.anrui.base.biz.busvehicleorder.BusVehicleOrderService;
+import com.yxt.anrui.base.common.enums.BillTypeEnum;
+import com.yxt.anrui.base.common.utils.Rule;
+import com.yxt.anrui.base.common.utils.domain.BillNo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundDto;
+import com.yxt.anrui.scm.api.scmapplyinbound.ScmApplyInboundFeign;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -48,6 +55,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -79,6 +87,10 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private BusVehicleOrderService busVehicleOrderService;
+    @Autowired
+    private ScmApplyInboundFeign scmApplyInboundFeign;
+    @Autowired
+    private SysOrganizationFeign sysOrganizationFeign;
 
 
    /* public PagerVo<BaseManufactorSubscription> listPage(PagerQuery<BaseManufactorSubscriptionQuery> pq) {
@@ -97,7 +109,7 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
 
         if (StringUtils.isNotBlank(query.getState())) {
             qw.eq("state", query.getState());
-            if("1".equals(query.getState())){
+            if ("1".equals(query.getState())) {
                 //若为认款，则按照认款日期倒序排序
                 qw.orderByDesc("subscriptionDate");
             }
@@ -217,33 +229,81 @@ public class BaseManufactorSubscriptionService extends MybatisBaseService<BaseMa
         }
         //推送采购订单的数据
         //根据排产订单编号查询排产订单的sid及排产申请的车型的sid及具体的车型中的信息
-        BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.selectByApplyCode(baseManufactorSubscription.getProSchAppNo());
+        if ("1".equals(baseManufactorSubscription.getApplyTypeKey())) {//厂家排产
-        if (busVehicleApplyDetailsVo != null) {
+            BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.selectByApplyCode(baseManufactorSubscription.getProSchAppNo());
-            List<BusVehicleOrderListDto> dtoList = new ArrayList<>();
+            if (busVehicleApplyDetailsVo != null) {
-            //根据申请人查询分公司sid
+                List<BusVehicleOrderListDto> dtoList = new ArrayList<>();
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid());
+                //根据申请人查询分公司sid
-            List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList();
+                ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid());
-            busVehicleApplyDetailVoList.removeAll(Collections.singleton(null));
+                List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList();
-            for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) {
+                busVehicleApplyDetailVoList.removeAll(Collections.singleton(null));
-                BusVehicleOrderListDto listDto = new BusVehicleOrderListDto();
+                for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) {
-                listDto.setPurchaseRequisitionSid(vo.getApplySid());
+                    BusVehicleOrderListDto listDto = new BusVehicleOrderListDto();
-                listDto.setPurchaseApplyMediumModelSid(vo.getSid());
+                    listDto.setPurchaseRequisitionSid(vo.getApplySid());
-                listDto.setCreateOrgSid(stringResultBean.getData());
+                    listDto.setPurchaseApplyMediumModelSid(vo.getSid());
-                listDto.setUseOrgSid(stringResultBean.getData());
+                    listDto.setCreateOrgSid(stringResultBean.getData());
-                listDto.setPlatformNo(vo.getQuantity());
+                    listDto.setUseOrgSid(stringResultBean.getData());
-                listDto.setOrderType("排产订单");
+                    listDto.setPlatformNo(vo.getQuantity());
-                listDto.setOrderTypeKey("001");
+                    listDto.setOrderType("排产订单");
-                listDto.setInsideCode(vo.getInsideCode());
+                    listDto.setOrderTypeKey("001");
-                listDto.setOrderStatus("待办");
+                    listDto.setInsideCode(vo.getInsideCode());
-                listDto.setSubscriptionDate(DateUtil.today());
+                    listDto.setOrderStatus("待办");
-                dtoList.add(listDto);
+                    listDto.setSubscriptionDate(DateUtil.today());
-            }
+                    dtoList.add(listDto);
-            busVehicleOrderService.saveVehicleOrder(dtoList);
+                }
+                busVehicleOrderService.saveVehicleOrder(dtoList);
 
+            }
+        } else if ("2".equals(baseManufactorSubscription.getApplyTypeKey())) {//厂家调车
+            BusVehicleApplyDetailsVo busVehicleApplyDetailsVo = busVehicleApplyService.selectByApplyCode(baseManufactorSubscription.getProSchAppNo());
+            if (busVehicleApplyDetailsVo != null) {
+                //根据申请人查询分公司sid
+                ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(busVehicleApplyDetailsVo.getCreateBySid());
+                List<BusVehicleApplyDetailVo> busVehicleApplyDetailVoList = busVehicleApplyDetailsVo.getBusVehicleApplyDetailList();
+                busVehicleApplyDetailVoList.removeAll(Collections.singleton(null));
+                for (BusVehicleApplyDetailVo vo : busVehicleApplyDetailVoList) {
+                    ScmApplyInboundDto scmApplyInbound = new ScmApplyInboundDto();
+                    //申请编号规则：单据名称大写首字母+品牌编码+分公司编码+年份+月份+4位顺序号
+                    //获取单据名称大写首字母+品牌编码+分公司编码+年份+月份
+                    String billNo = getApplyCode(dto.getUserSid());
+                    scmApplyInbound.setApplicationCode(billNo);
+                    scmApplyInbound.setModelSid(vo.getVehicleSid());
+                    scmApplyInbound.setModelName(vo.getVehicleName());
+                    scmApplyInbound.setApplicationDate(DateUtil.today());
+                    scmApplyInbound.setVehicleOrderSid(dto.getSid());
+                    scmApplyInbound.setPurchaseOrderNo(baseManufactorSubscription.getProSchAppNo());
+                    scmApplyInbound.setApplicationSid(dto.getUserSid());
+                    scmApplyInbound.setUserSid(dto.getUserSid());
+                    scmApplyInbound.setApplicationName(busVehicleApplyDetailsVo.getCreateByName());
+                    scmApplyInbound.setConfigName(vo.getConfigName());
+                    scmApplyInbound.setConfigSid(vo.getConfigSid());
+                    scmApplyInbound.setNodeState("待提交");
+                    scmApplyInbound.setNum(vo.getQuantity());
+                    scmApplyInbound.setContractPrice(new BigDecimal(vo.getContractPrice()));
+                    scmApplyInbound.setCostPrice(new BigDecimal(vo.getContractPrice()));
+                    scmApplyInbound.setInsideCode(vo.getInsideCode());
+                    scmApplyInboundFeign.saveOrUpdateApplyInBound(scmApplyInbound);
+                }
+            }
         }
+
         return rb.success().setMsg("操作成功");
     }
 
+    public String getApplyCode(String userSid) {
+        //获取分公司sid
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgCode = resultBean1.getData().getOrgCode();
+        BillNo b = new BillNo();
+        b.setOrgCode(orgCode);
+        b.setBillType(BillTypeEnum.RZSQ.getBillType());
+        String bill = Rule.getBill(b);
+        int i = scmApplyInboundFeign.selectNum(bill);
+        String billNo = Rule.getBillNo(bill, i);
+        return billNo;
+    }
+
     public ResultBean updatePaymentState(BaseManufUpdateDto dto) {
         ResultBean resultBean = ResultBean.fireFail();
         String sid = dto.getSid();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -14,7 +14,9 @@
                         bva.createOrgName,
                         bva.currentAmount                              applyForDeposit,
                         bva.procDefId,
-                        bva.procInstId
+                        bva.procInstId,
+                        bva.applyType,
+                        bva.applyTypeKey
         FROM bus_vehicle_apply bva
                  LEFT JOIN bus_vehicle_apply_detail bvad
                            ON bva.sid = bvad.`applySid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -446,6 +446,8 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                 baseManufactorSubscriptionDto.setUseOrgSid(stringResultBean.getData());
                 baseManufactorSubscriptionDto.setPaymentMoney(busVehicleApply.getCurrentAmount().toString());//打款金额
                 baseManufactorSubscriptionDto.setProSchAppNo(busVehicleApply.getApplicationCode());//排产申请编号
+                baseManufactorSubscriptionDto.setApplyType(busVehicleApply.getApplyType());
+                baseManufactorSubscriptionDto.setApplyTypeKey(busVehicleApply.getApplyTypeKey());
                 ResultBean<String> r = baseManufactorSubscriptionService.saveDto(baseManufactorSubscriptionDto);
 
                 //推送到财务出纳