Merge remote-tracking branch 'origin/master'

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBill.java

@@ -20,7 +20,9 @@ public class AsBusrepairBill extends BaseEntity {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
-    private Integer billType;
+    private Integer billTypeKey;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billType;
     @ApiModelProperty("进厂时间")
     private Date entryTime;
     @ApiModelProperty("预计完工时间-工单")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDetailsVo.java

@@ -38,6 +38,8 @@ public class AsBusrepairBillDetailsVo implements Vo {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billTypeKey;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
     private String billType;
     @ApiModelProperty("进厂时间")
     private String entryTime;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillDto.java

@@ -41,6 +41,8 @@ public class AsBusrepairBillDto implements Dto {
     @ApiModelProperty("创建组织sid")
     private String createOrgSid;
     @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
+    private String billTypeKey;
+    @ApiModelProperty("单据类型0正常工单、1保险理赔、2协议单位")
     private String billType;
     @ApiModelProperty("进厂时间")
     private String entryTime;

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/AsBusrepairBillVo.java

@@ -16,7 +16,7 @@ import java.util.Date;
 @Data
 public class AsBusrepairBillVo implements Vo {
 
-
+    private String sid;
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("当前环节")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InsuranceVo.java

@@ -15,6 +15,10 @@ public class InsuranceVo {
     private String responsibility;
     @ApiModelProperty("对方险种")
     private String otherInsuranceType;
+    @ApiModelProperty("责任划分")
+    private String responsibilityKey;
+    @ApiModelProperty("对方险种")
+    private String otherInsuranceTypeKey;
     @ApiModelProperty("保险公司1")
     private String insuranceCompany1;
     @ApiModelProperty("保险公司2")
@@ -31,4 +35,6 @@ public class InsuranceVo {
     private String isSpecialSign;
     @ApiModelProperty("出险类型")
     private String accidentType;
+    @ApiModelProperty("出险类型")
+    private String accidentTypeKey;
 }

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/InvoiceVo.java

@@ -17,6 +17,8 @@ public class InvoiceVo {
     private String isInvoicing;
     @ApiModelProperty("发票类型")
     private String invoiceType;
+    @ApiModelProperty("发票类型")
+    private String invoiceTypeKey;
     @ApiModelProperty("开票名称")
     private String invoiceTitle;
     @ApiModelProperty("税号")

yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbillinsurance/AsBusrepairBillInsurance.java

@@ -23,6 +23,10 @@ public class AsBusrepairBillInsurance extends BaseEntity {
     private String responsibility;
     @ApiModelProperty("对方险种")
     private String otherInsuranceType;
+    @ApiModelProperty("责任划分")
+    private String responsibilityKey;
+    @ApiModelProperty("对方险种")
+    private String otherInsuranceTypeKey;
     @ApiModelProperty("保险公司1")
     private String insuranceCompany1;
     @ApiModelProperty("保险公司2")
@@ -39,4 +43,6 @@ public class AsBusrepairBillInsurance extends BaseEntity {
     private Integer isSpecialSign;
     @ApiModelProperty("出险类型")
     private String accidentType;
+    @ApiModelProperty("出险类型")
+    private String accidentTypeKey;
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicepackage/AsServicePackageMapper.xml

@@ -40,4 +40,4 @@
         WHERE
             useOrgSid = #{useOrgSid}
     </select>
-</mapper>
+</mapper>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asservicesubject/AsServiceSubjectService.java

@@ -88,6 +88,7 @@ public class AsServiceSubjectService extends MybatisBaseService<AsServiceSubject
 			SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(createOrgSid).getData();
 			dto.setCreateOrgSid(createOrgSid);
 			dto.setCreateOrgName(sysOrganizationVo.getName());
+			dto.setUseOrgSid(createOrgSid);
             this.insertByDto(dto);
             return; 
         } 

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java

@@ -156,10 +156,6 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 	public ResultBean<String> saveOrUpdateDto(PmsPurchasebackBillDto dto){
 		ResultBean rb = ResultBean.fireFail();
         String dtoSid = dto.getSid();
-		int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid());
-		if (i > 0){
-			return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请");
-		}
 		List<PmsPurchasebackDetailDto> pmsPurchasebackDetailList = dto.getPmsPurchasebackDetailList();
 		String deptSid = dto.getDeptSid();
 		SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
@@ -170,6 +166,10 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 		dto.setCreateOrgSid(useOrgSid);
 		dto.setCreateOrgName(organizationVo.getName());
 		if (StringUtils.isBlank(dtoSid)) {
+			int i = baseMapper.checkNodeStateBySourceBillSid(dto.getSourceBillSid());
+			if (i > 0){
+				return rb.setMsg(dto.getSourceBillNo() + "存在待提交或审批中的申请");
+			}
 			//生成单据编号
 			String billNo = "";
 			String date = DateUtil.format(DateUtil.date(), "yyyyMM");

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.java

@@ -34,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -59,4 +60,6 @@ public interface PmsPurchasebackDetailMapper extends BaseMapper<PmsPurchasebackD
 
 	@Select("select * from pms_purchaseback_detail where billSid = #{billSid}")
 	List<PmsPurchasebackDetailDetailsVo> selByMainSid(String billSid);
+
+	BigDecimal checkReturnedCount(@Param("goodsSkuSid") String goodsSkuSid,@Param("sourceBillSid") String sourceBillSid);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailMapper.xml

@@ -6,4 +6,16 @@
 	<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailVo">
 		SELECT * FROM pms_purchaseback_detail <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="checkReturnedCount" resultType="java.math.BigDecimal">
+		SELECT
+				IFNULL(SUM(ppd.backCount), 0)
+		FROM
+				pms_purchaseback_detail ppd
+						LEFT JOIN pms_purchaseback_bill ppb
+						ON ppd.`billSid` = ppb.sid
+		WHERE ppd.goodsSkuSid = #{goodsSkuSid}
+		  AND ppb.`sourceBillSid` = #{sourceBillSid}
+		  AND ppb.`nodeState` = '已办结'
+	</select>
 </mapper>

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackdetail/PmsPurchasebackDetailService.java

@@ -36,6 +36,7 @@ import com.yxt.common.core.vo.PagerVo;
 
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -64,12 +65,7 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
 	}
 	
 	public void saveOrUpdateDto(PmsPurchasebackDetailDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
+		this.insertByDto(dto);
 	}
 	
 	public void insertByDto(PmsPurchasebackDetailDto dto){
@@ -78,16 +74,6 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
 		baseMapper.insert(entity);
 	}
 	
-	public void updateByDto(PmsPurchasebackDetailDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchasebackDetail entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
 	public PmsPurchasebackDetailDetailsVo fetchDetailsVoBySid(String sid){
 		PmsPurchasebackDetail entity = fetchBySid(sid);
 		PmsPurchasebackDetailDetailsVo vo = new PmsPurchasebackDetailDetailsVo();
@@ -102,4 +88,8 @@ public class PmsPurchasebackDetailService extends MybatisBaseService<PmsPurchase
 	public List<PmsPurchasebackDetailDetailsVo> selByMainSid(String billSid) {
 		return baseMapper.selByMainSid(billSid);
 	}
+
+	public BigDecimal checkReturnedCount(String goodsSkuSid,String sourceBillSid) {
+		return baseMapper.checkReturnedCount(goodsSkuSid,sourceBillSid);
+	}
 }

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

@@ -33,6 +33,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillService;
+import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
 import com.yxt.pms.biz.pms.pmspurchasebill.flowable.*;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailDto;
@@ -91,6 +92,8 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
     @Autowired
     private PmsPurchasebackBillService pmsPurchasebackBillService;
     @Autowired
+    private PmsPurchasebackDetailService pmsPurchasebackDetailService;
+    @Autowired
     private PmsPurchaseBillDetailService pmsPurchaseBillDetailService;
     @Autowired
     private PmsPurchaseBillInvoiceService pmsPurchaseBillInvoiceService;
@@ -212,6 +215,10 @@ public class PmsPurchaseBillService extends MybatisBaseService<PmsPurchaseBillMa
                 record.setPayableAmount(money);
             }
             List<PmsPurchaseBillDetailDetailsVo> pmsPurchaseBillDetailDetailsVos = pmsPurchaseBillDetailService.selByMainSid(record.getSid());
+            for (PmsPurchaseBillDetailDetailsVo pmsPurchaseBillDetailDetailsVo : pmsPurchaseBillDetailDetailsVos) {
+                BigDecimal returnedCount = pmsPurchasebackDetailService.checkReturnedCount(pmsPurchaseBillDetailDetailsVo.getGoodsSkuSid(),record.getSid());
+                pmsPurchaseBillDetailDetailsVo.setReturnedCount(returnedCount);
+            }
             record.setPmsPurchaseBillDetailList(pmsPurchaseBillDetailDetailsVos);
         }
         PagerVo<PmsPurchaseChoiceBillVo> p = PagerUtil.pageToVo(pagging, null);

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebilldetail/PmsPurchaseBillDetailDetailsVo.java

@@ -85,4 +85,7 @@ public class PmsPurchaseBillDetailDetailsVo implements Vo {
     private BigDecimal taxPrice; // 含税价
 	@ApiModelProperty("采购金额")
     private BigDecimal amount; // 采购金额
+
+    @ApiModelProperty("已退数量")
+    private BigDecimal returnedCount;
 }

yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java

@@ -8,7 +8,7 @@ public enum ProcDefEnum {
 
     /***************************正式流程id***********************************/
     PMSPURCHASEBILL("采购单申请", "process_cx2htjth:1:11280004"),
-    PMSPURCHASEBACKBILL("采购退货单申请", "process_cx2htjth:1:11280004"),
+    PMSPURCHASEBACKBILL("采购退货单申请", "process_00x6bf4z:1:11305004"),
     ;