修改调车申请、修改入账申请

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchase.java

@@ -54,14 +54,18 @@ public class BaseInternalPurchase extends BaseEntity {
     private String applyNo; // 申请编号
 	@ApiModelProperty("申请人姓名")
     private String applyPeoName; // 申请人姓名
-	@ApiModelProperty("购方机构sid")
-    private String buyerOrgSid; // 购方机构sid
-	@ApiModelProperty("购方机构名称")
-    private String buyerOrgName; // 购方机构名称
-	@ApiModelProperty("售方机构sid")
-    private String sellerOrgSid; // 售方机构sid
-	@ApiModelProperty("售方机构名称")
-    private String sellerOrgName; // 售方机构名称
+	@ApiModelProperty("调入分公司sid")
+    private String buyerOrgSid; // 调入分公司sid
+	@ApiModelProperty("调入分公司名称")
+    private String buyerOrgName; // 调入分公司名称
+	@ApiModelProperty("调出分公司sid")
+    private String sellerOrgSid; // 调出分公司sid
+	@ApiModelProperty("调出分公司名称")
+    private String sellerOrgName; // 调出分公司名称
+    @ApiModelProperty("调车类型（0调入，1调出）")
+    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java

@@ -66,14 +66,18 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
     private String createBySid; // 创建人sid
 	@ApiModelProperty("申请人姓名")
     private String applyPeoName; // 申请人姓名
-	@ApiModelProperty("购方机构sid")
-    private String buyerOrgSid; // 购方机构sid
-	@ApiModelProperty("购方机构名称")
-    private String buyerOrgName; // 购方机构名称
-	@ApiModelProperty("售方机构sid")
-    private String sellerOrgSid; // 售方机构sid
-	@ApiModelProperty("售方机构名称")
-    private String sellerOrgName; // 售方机构名称
+    @ApiModelProperty("调入分公司sid")
+    private String buyerOrgSid; // 调入分公司sid
+    @ApiModelProperty("调入分公司名称")
+    private String buyerOrgName; // 调入分公司名称
+    @ApiModelProperty("调出分公司sid")
+    private String sellerOrgSid; // 调出分公司sid
+    @ApiModelProperty("调出分公司名称")
+    private String sellerOrgName; // 调出分公司名称
+    @ApiModelProperty("调车类型（0调入，1调出）")
+    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDto.java

@@ -60,14 +60,18 @@ public class BaseInternalPurchaseDto implements Dto {
     private String applyNo; // 申请编号
 	@ApiModelProperty("申请人姓名")
     private String applyPeoName; // 申请人姓名
-	@ApiModelProperty("购方机构sid")
-    private String buyerOrgSid; // 购方机构sid
-	@ApiModelProperty("购方机构名称")
-    private String buyerOrgName; // 购方机构名称
-	@ApiModelProperty("售方机构sid")
-    private String sellerOrgSid; // 售方机构sid
-	@ApiModelProperty("售方机构名称")
-    private String sellerOrgName; // 售方机构名称
+    @ApiModelProperty("调入分公司sid")
+    private String buyerOrgSid; // 调入分公司sid
+    @ApiModelProperty("调入分公司名称")
+    private String buyerOrgName; // 调入分公司名称
+    @ApiModelProperty("调出分公司sid")
+    private String sellerOrgSid; // 调出分公司sid
+    @ApiModelProperty("调出分公司名称")
+    private String sellerOrgName; // 调出分公司名称
+    @ApiModelProperty("调车类型（0调入，1调出）")
+    private String shuntingType; // 调车类型（0调入，1调出）
+    @ApiModelProperty("车辆数量")
+    private String num; // 车辆数量
 	@ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
 	@ApiModelProperty("创建组织sid")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseVo.java

@@ -65,8 +65,10 @@ public class BaseInternalPurchaseVo implements Vo {
     private Date createTime; // 申请日期
     @ApiModelProperty("台数")
     private String num; // 台数
-	@ApiModelProperty("购方机构名称")
-    private String buyerOrgName; // 购方机构名称
-	@ApiModelProperty("售方机构名称")
-    private String sellerOrgName; // 售方机构名称
+    @ApiModelProperty("调入分公司名称")
+    private String buyerOrgName; // 调入分公司名称
+    @ApiModelProperty("调出分公司名称")
+    private String sellerOrgName; // 调出分公司名称
+    @ApiModelProperty("调车类型（0调入，1调出）")
+    private String shuntingType; // 调车类型（0调入，1调出）
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -63,18 +63,18 @@ public class BaseVehicle extends BaseEntity {
     private String orderingNo;
 
     @ApiModelProperty(value = "入库价")
-    private float costPriced;
+    private Integer costPriced;
     @ApiModelProperty(value = "运费")
-    private float freight;
+    private Integer freight;
     @ApiModelProperty(value = "厂家合同价")
-    private float contractPrice;
+    private Integer contractPrice;
     @ApiModelProperty(value = "厂家入库日期")
     private Date priceDate;
     @ApiModelProperty(value = "实销日期")
     private Date solidDate;
 
     @ApiModelProperty(value = "指导价")
-    private float salePrice;
+    private Integer salePrice;
 
     @ApiModelProperty("创建组织(陕汽必须的字段)")
     private String createOrgSid;
@@ -131,4 +131,6 @@ public class BaseVehicle extends BaseEntity {
     private String manPurOrderTypeValue;
     @ApiModelProperty("特殊或差异说明")
     private String specialInstructions;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -81,6 +81,8 @@ public class BaseVehicleDto implements Dto {
     private String locationName;
     @ApiModelProperty(value = "厂家入库价")
     private Integer costPriced;
+    @ApiModelProperty(value = "厂家合同价")
+    private Integer contractPrice;
     @ApiModelProperty(value = "成交价")
     private Integer salePrice;
     @ApiModelProperty("保修卡号")
@@ -97,4 +99,8 @@ public class BaseVehicleDto implements Dto {
     private String useOrgSid;
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+    @ApiModelProperty(value = "运费")
+    private Integer freight;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.java

@@ -67,4 +67,6 @@ public interface BaseInternalPurchaseMapper extends BaseMapper<BaseInternalPurch
     int updateFlowFiled(Map<String, Object> beanToMap);
 
     int selectNum(String bill);
+
+    int selectBySid(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml

@@ -47,4 +47,11 @@
 		from base_internal_purchase
 		where applyNo LIKE concat(#{bill}, '%')
     </select>
+
+	<select id="selectBySid" resultType="int">
+		select count(*)
+		from base_internal_purchase
+		where length(nodeState) > 0
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@@ -203,6 +203,11 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
 
 	public ResultBean delAll(String[] sids) {
 		ResultBean rb = ResultBean.fireFail();
+		//查询该sid中是否有流程不是待提交的
+		int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+		if (count > 0) {
+			return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+		}
 		delBySids(sids);
 		for (String sid : sids) {
 			baseInternalPurchaseVehicleService.delByMainSid(sid);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java

@@ -65,4 +65,6 @@ public interface BaseModelModpriceMapper extends BaseMapper<BaseModelModprice> {
 	List<BaseModelModpriceVo> selectListVo();
 
     int updateFlowFiled(Map<String, Object> beanToMap);
+
+    int selectBySid(String join);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml

@@ -33,4 +33,11 @@
 		</if>
 		WHERE sid=#{sid}
     </update>
+
+	<select id="selectBySid" resultType="int">
+		select count(*)
+		from base_model_modprice
+		where length(nodeState) > 0
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java

@@ -158,6 +158,11 @@ public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpri
 
     public ResultBean delAll(String[] sids) {
         ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
         delBySids(sids);
         for (String sid : sids) {
             baseModelModpriceModelService.delByMainSid(sid);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInbound.java

@@ -6,6 +6,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * Project: anrui-scm(进销存) <br/>
  * File: ScmApplyInbound.java <br/>
@@ -54,9 +56,33 @@ public class ScmApplyInbound extends BaseEntity {
 
     @ApiModelProperty("常用配置Sid")
     private String configSid;
-    
-	@ApiModelProperty("厂家发车日期")
+    @ApiModelProperty("厂家合同价")
+    private BigDecimal contractPrice;
+    @ApiModelProperty("其中上装价格")
+    private BigDecimal amongSzPrice;
+    @ApiModelProperty("上装价格计算依据")
+    private String szPriceCalBasis;
+    @ApiModelProperty("一次运费")
+    private BigDecimal onceFreight;
+    @ApiModelProperty("二次运费")
+    private BigDecimal secondaryFreight;
+    @ApiModelProperty("下浮比例")
+    private String lowerProportion;
+    @ApiModelProperty("下浮金额")
+    private BigDecimal lowerMoney;
+    @ApiModelProperty("下浮合计")
+    private BigDecimal lowerTotal;
+    @ApiModelProperty("下浮备注")
+    private String lowerRemarks;
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+
+    @ApiModelProperty("厂家发车日期")
     private String departureDate;
+    @ApiModelProperty("厂家入库日期")
+    private String priceDate;
 
     @ApiModelProperty("'流程定义的id'")
     private String procDefId;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundDto.java

@@ -11,6 +11,7 @@ import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Pattern;
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -73,7 +74,32 @@ public class ScmApplyInboundDto implements Dto {
     private String configName;
     @ApiModelProperty("常用配置Sid")
     private String configSid;
-    
+
+    @ApiModelProperty("厂家合同价")
+    private BigDecimal contractPrice;
+    @ApiModelProperty("其中上装价格")
+    private BigDecimal amongSzPrice;
+    @ApiModelProperty("上装价格计算依据")
+    private String szPriceCalBasis;
+    @ApiModelProperty("一次运费")
+    private BigDecimal onceFreight;
+    @ApiModelProperty("二次运费")
+    private BigDecimal secondaryFreight;
+    @ApiModelProperty("下浮比例")
+    private String lowerProportion;
+    @ApiModelProperty("下浮金额")
+    private BigDecimal lowerMoney;
+    @ApiModelProperty("下浮合计")
+    private BigDecimal lowerTotal;
+    @ApiModelProperty("下浮备注")
+    private String lowerRemarks;
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
+
+    @ApiModelProperty("厂家入库日期")
+    private String priceDate;
 	@ApiModelProperty("厂家发车日期")
     private String departureDate;
 

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmapplyinbound/ScmApplyInboundVo.java

@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -56,6 +57,29 @@ public class ScmApplyInboundVo implements Vo {
 
     @ApiModelProperty("常用配置 ")
     private String configName;
+
+    @ApiModelProperty("厂家合同价")
+    private BigDecimal contractPrice;
+    @ApiModelProperty("其中上装价格")
+    private BigDecimal amongSzPrice;
+    @ApiModelProperty("上装价格计算依据")
+    private String szPriceCalBasis;
+    @ApiModelProperty("一次运费")
+    private BigDecimal onceFreight;
+    @ApiModelProperty("二次运费")
+    private BigDecimal secondaryFreight;
+    @ApiModelProperty("下浮比例")
+    private String lowerProportion;
+    @ApiModelProperty("下浮金额")
+    private BigDecimal lowerMoney;
+    @ApiModelProperty("下浮合计")
+    private BigDecimal lowerTotal;
+    @ApiModelProperty("下浮备注")
+    private String lowerRemarks;
+    @ApiModelProperty("厂家结算价")
+    private BigDecimal costPrice;
+    @ApiModelProperty("内部编码")
+    private String insideCode;
     
 	@ApiModelProperty("厂家发车日期")
     private String departureDate;

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -388,6 +388,18 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
                 baseVehicleDto.setCreateOrgSid(data);
                 baseVehicleDto.setModelConfigSid(dto.getConfigSid());
                 baseVehicleDto.setConfigName(dto.getConfigName());
+                baseVehicleDto.setInsideCode(dto.getInsideCode());
+                baseVehicleDto.setLockedState("0");
+                baseVehicleDto.setLockedStateValue("未锁定");
+                baseVehicleDto.setVehicleState("0003");
+                baseVehicleDto.setVehicleStateValue("在途");
+                baseVehicleDto.setManPurOrderTypeKey("001");
+                baseVehicleDto.setManPurOrderTypeValue("排产订单");
+                baseVehicleDto.setContractPrice(Integer.parseInt(dto.getContractPrice().toString()));
+                baseVehicleDto.setFreight(Integer.parseInt(dto.getOnceFreight().subtract(dto.getSecondaryFreight()).toString()));
+                baseVehicleDto.setCostPriced(Integer.parseInt(dto.getCostPrice().toString()));
+                baseVehicleDto.setPriceDate(dto.getPriceDate());
+                baseVehicleDto.setDepartureDate(dto.getDepartureDate());
                 baseVehicleDtos.add(baseVehicleDto);
             }
             baseVehicleFeign.saveAll(baseVehicleDtos);