Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicle/BusSalesVehicleMapper.xml

@@ -43,7 +43,7 @@
             </if>
         </where>
 
-        order by bvoa.saleDate desc,bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc
+        order by bv.useOrgName desc,bvoa.orgName desc,bvoa.staffName desc,bvoa.customerName desc,bvoa.contractNo desc,bvoa.saleDate desc
     </select>
 
     <select id="exportList" resultType="com.yxt.anrui.buscenter.api.bussalesvehicle.BusSalesVehicleExportVo">

doc/databases/统计报表更新.sql

@@ -348,7 +348,7 @@ BEGIN
                                                  left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
                                         WHERE bo.nodeState = '已办结'
                                           AND (bs.busState = '602' or bs.busState = '501' or bs.busState = '502' or
-                                               bs.busState = '503' or bs.busState = '601' or bs.busState = '602')
+                                               bs.busState = '503' or bs.busState = '601')
                                           and bo.useOrgSid = a.useOrgSid
                                           and bm.modelSid = a.modelSid
                                           and bm.modelConfigSid = a.modelConfigSid
@@ -367,19 +367,60 @@ BEGIN
                                           and bs.busSid is null
                                           and bo.contractNo = a.contractNo) as ssscount
                                 FROM (
-                                         SELECT count(bov.id) AS scount,
-                                                bo.useOrgSid,
-                                                bm.modelSid,
-                                                bm.modelConfigSid,
-                                                bo.contractNo
-                                         FROM anrui_buscenter.bus_sales_order_vehicle bov
-                                                  LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
-                                                  LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
-                                         WHERE bo.nodeState = '已办结'
-                                         GROUP BY bo.useOrgSid,
-                                                  bm.modelSid,
-                                                  bm.modelConfigSid,
-                                                  bo.contractNo
+                                         select sum(scount) as scount,
+                                                d.useOrgSid,
+                                                d.modelSid,
+                                                d.modelConfigSid,
+                                                d.contractNo
+                                         from (SELECT count(bov.id) AS scount,
+                                                      bo.useOrgSid,
+                                                      bm.modelSid,
+                                                      bm.modelConfigSid,
+                                                      bo.contractNo
+                                               FROM anrui_buscenter.bus_sales_order_vehicle bov
+                                                        LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
+                                                        LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                               WHERE bo.nodeState = '已办结'
+                                                 and bo.type = 1
+                                                 and length(bov.linkSid) > 0
+                                               GROUP BY bo.useOrgSid,
+                                                        bm.modelSid,
+                                                        bm.modelConfigSid,
+                                                        bo.contractNo
+                                               union all
+                                               SELECT bp.quantity as scount,
+                                                      bo.useOrgSid,
+                                                      bm.modelSid,
+                                                      bm.modelConfigSid,
+                                                      bo.contractNo
+                                               from anrui_buscenter.bus_sales_order bo
+                                                        LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                        left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                                               WHERE bo.nodeState = '已办结'
+                                                 and bo.type = 2
+                                               GROUP BY bo.useOrgSid,
+                                                        bm.modelSid,
+                                                        bm.modelConfigSid,
+                                                        bo.contractNo
+                                               union all
+                                               SELECT bp.quantity as scount,
+                                                      bo.useOrgSid,
+                                                      bm.modelSid,
+                                                      bm.modelConfigSid,
+                                                      bo.contractNo
+                                               from anrui_buscenter.bus_sales_order bo
+                                                        LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
+                                                        left join anrui_buscenter.bus_sales_order_price bp on bp.salesOrderSid = bo.sid
+                                               WHERE bo.nodeState = '已办结'
+                                                 and bo.type = 3
+                                               GROUP BY bo.useOrgSid,
+                                                        bm.modelSid,
+                                                        bm.modelConfigSid,
+                                                        bo.contractNo) d
+                                         group by d.useOrgSid,
+                                                  d.modelSid,
+                                                  d.modelConfigSid,
+                                                  d.contractNo
                                      ) a) b) c
                     group by c.useOrgSid, c.modelSid, c.modelConfigSid
         ) AS s ON r.useOrgSid = s.useOrgSid
@@ -396,7 +437,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', CURDATE(), '%')
-                            and bvoa.saleTypeKey = '001'
+                            and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -414,7 +455,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', CURDATE(), '%')
-                            and bvoa.saleTypeKey = '002'
+                            and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -439,7 +480,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                            and bvoa.saleTypeKey = '001'
+                            and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -457,7 +498,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y-%m'), '%')
-                            and bvoa.saleTypeKey = '002'
+                            and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -482,7 +523,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                            and bvoa.saleTypeKey = '001'
+                            and bvoa.saleTypeKey = '001' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -500,7 +541,7 @@ BEGIN
                                    left join anrui_base.base_vehicle_out bvo on bv.sid = bvo.vinSid
                                    left join anrui_base.base_vehicle_out_apply bvoa on bvoa.sid = bvo.mainSid
                           where bv.salesDate like concat('%', DATE_FORMAT(CURDATE(), '%Y'), '%')
-                            and bvoa.saleTypeKey = '002'
+                            and bvoa.saleTypeKey = '002' and bvo.isDelete = 0
                             and (bvo.materialTypeKey = '001' or bvo.materialTypeValue is null or
                                  length(bvo.materialTypeValue) = 0)
                           group by bv.useOrgSid, bv.modelSid, bv.modelConfigSid) ss
@@ -1099,7 +1140,8 @@ BEGIN
                        WHERE bo.payTypeKey = 2
                          and ss.busVinSid is null
                          AND bbv.vehicleState = '0002'
-                         and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
+                         and bo.nodeState = '已办结'
+                         and bo.contractNo NOT LIKE '%2023%'
                        GROUP BY bv.sid,
                                 bo.useOrgSid,
                                 bm.modelSid,
@@ -1210,7 +1252,8 @@ BEGIN
                        WHERE bo.payTypeKey = 2
                          and ss.busVinSid is null
                          AND bbv.vehicleState = '0002'
-                         and bo.nodeState = '已办结' and bo.contractNo NOT LIKE '%2023%'
+                         and bo.nodeState = '已办结'
+                         and bo.contractNo NOT LIKE '%2023%'
                        GROUP BY bv.sid,
                                 bo.useOrgSid,
                                 bm.modelSid,

yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml

@@ -13,7 +13,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_arrearsout_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java

@@ -233,7 +233,7 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService<AsBusclaimI
         bv.setFormVariables(variables);
         if (r == 1) {
             //ToDo:流程定义id
-            bv.setModelId("");
+            bv.setModelId(ProcDefEnum.ASBUSCLAIMINVOICEBILL.getProDefId());
             ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
             if (!voResultBean.getSuccess()) {
                 return rb.setMsg(voResultBean.getMsg());

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldparthandleapply/AsOldparthandleApplyMapper.xml

@@ -20,7 +20,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_oldparthandle_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-as/src/main/java/com/yxt/anrui/as/biz/asoldpartreturnapply/AsOldpartreturnApplyMapper.xml

@@ -31,7 +31,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE as_oldpartreturn_apply
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java

@@ -11,6 +11,7 @@ public enum ProcDefEnum {
     ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_6de5c2r8:1:10640004"),
     ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_sshks74p:1:10887504"),
     REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:1:10975004"),
+    ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_33p7rz6h:1:11297504"),
     ;
 
 

yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodssku/BaseGoodsSkuService.java

@@ -219,7 +219,7 @@ public class BaseGoodsSkuService extends MybatisBaseService<BaseGoodsSkuMapper,
         QueryWrapper<BaseGoodsSku> qw = new QueryWrapper<>();
         if (query != null) {
             if (StringUtils.isNotBlank(query.getOrgSid())) {
-                qw.eq("spu.useOrgSid", query.getOrgSid());
+                qw.eq("spu.createOrgSid", query.getOrgSid());
             }
             //商品名称
             if (StringUtils.isNotBlank(query.getGoodsSpuName())) {

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

@@ -94,21 +94,4 @@ public class PmsPurchasebackBillRest {
 		PmsPurchasebackBillDetailsVo vo = pmsPurchasebackBillService.fetchDetailsVoBySid(sid);
 		return rb.success().setData(vo);
 	}
-
-	@PostMapping("/exportExcel")
-	@ApiOperation(value = "导出")
-	public void exportExcel(@RequestBody PmsPurchasebackBillQuery query) {
-		//得到所有要导出的数据
-		List<PmsPurchasebackBillExcelVo> exportVoList = pmsPurchasebackBillService.listExcel(query);
-		//定义导出的excel名字
-		String excelName = "出入库查询";
-		String fileNameURL = "";
-		try {
-			fileNameURL = URLEncoder.encode(excelName, "UTF-8");
-		} catch (UnsupportedEncodingException e) {
-			e.printStackTrace();
-		}
-		ExportExcelUtils.export(fileNameURL, exportVoList, PmsPurchasebackBillExcelVo.class, response);
-
-	}
 }

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

@@ -53,11 +53,5 @@ import java.util.List;
 public interface PmsPurchasebackBillMapper extends BaseMapper<PmsPurchasebackBill> {
 
 	IPage<PmsPurchasebackBillVo> selectPageVo(IPage<PmsPurchasebackBill> page, @Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
-	
-	List<PmsPurchasebackBillVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<PmsPurchasebackBill> qw);
-	
-	@Select("select * from pms_purchaseback_bill")
-	List<PmsPurchasebackBillVo> selectListVo();
 
-	List<PmsPurchasebackBillExcelVo> listExcel(@Param(Constants.WRAPPER) QueryWrapper<PmsPurchasebackBillExcelVo> qw);
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillMapper.xml

@@ -6,43 +6,24 @@
 	<select id="selectPageVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
 		SELECT
 		ppb.sid,
+		ppb.`nodeState`,
 		ppb.billNo,
+		ppb.createOrgName,
+		ppb.`deptName`,
 		ppb.createTime,
+		ppb.`finishTime`,
 		pb.billNo AS sourceBillNo,
+		pb.`payTypeValue`,
+		pb.`purchaseReasonValue`,
+		pb.`purchaseTypeValue`,
 		pb.supplierName,
-		pb.supplierPhone,
-		pb.purchaserName,
-		pb.storekeeperName,
-		pbs.settleTime
+		SUM(ppbd.backAmount) AS backAmountCount
 		FROM
 		pms_purchaseback_bill ppb
 		LEFT JOIN pms_purchase_bill pb
 		ON ppb.`sourceBillSid` = pb.`sid`
-		LEFT JOIN pms_purchase_bill_settle pbs
-		ON pbs.`billSid` = pb.`sid`
+		LEFT JOIN pms_purchase_bill_detail ppbd
+		ON ppb.`sid` = ppbd.`billSid`
 		<where> ${ew.sqlSegment} </where>
 	</select>
-	
-	<select id="selectListAllVo" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillVo">
-		SELECT * FROM pms_purchaseback_bill <where> ${ew.sqlSegment} </where>
-	</select>
-
-	<select id="listExcel" resultType="com.yxt.pms.biz.pms.pmspurchasebackbill.PmsPurchasebackBillExcelVo">
-		SELECT
-		ppb.billNo,
-		ppb.createTime,
-		pb.billNo AS sourceBillNo,
-		pb.supplierName,
-		pb.supplierPhone,
-		pb.purchaserName,
-		pb.storekeeperName,
-		pbs.settleTime
-		FROM
-		pms_purchaseback_bill ppb
-		LEFT JOIN pms_purchase_bill pb
-		ON ppb.`sourceBillSid` = pb.`sid`
-		LEFT JOIN pms_purchase_bill_settle pbs
-		ON pbs.`billSid` = pb.`sid`
-		<where> ${ew.sqlSegment} </where>
-    </select>
 </mapper>

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

@@ -51,20 +51,33 @@ import java.math.BigDecimal;
 @ApiModel(value = "采购退货单据 查询条件", description = "采购退货单据 查询条件")
 public class PmsPurchasebackBillQuery implements Query {
 
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @ApiModelProperty("申请人")
+    private String createByName;
+    @ApiModelProperty("单据编号")
+    private String billNo;
     @ApiModelProperty("创建开始日期")
     private String createStartTime;
     @ApiModelProperty("创建结束日期")
     private String createEndTime;
-    @ApiModelProperty("门店sid")
-    private String createOrgSid;
-    @ApiModelProperty("单据状态(0未作废,1已作废)")
-    private String documentState;
-    @ApiModelProperty("票据类型key")
-    private String billTypeKey;
-    @ApiModelProperty("供应商sid")
-    private String supplierSid;
-    @ApiModelProperty("欠款状态(0欠款,1未欠款)")
-    private String arrearsState;
-    @ApiModelProperty("其他查询条件")
-    private String otherQuery;
+    @ApiModelProperty("办结开始日期")
+    private String finishStartTime;
+    @ApiModelProperty("办结结束日期")
+    private String finishEndTime;
+    @ApiModelProperty("来源单编号")
+    private String sourceBillNo;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
+    @ApiModelProperty("供应商名称")
+    private String supplierName;
+
+    @ApiModelProperty("组织全路径")
+    private String orgPath;
 }

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

@@ -31,6 +31,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDetailsVo;
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailDto;
 import com.yxt.pms.biz.pms.pmspurchasebackdetail.PmsPurchasebackDetailService;
+import com.yxt.pms.biz.pms.pmspurchasebilldetail.PmsPurchaseBillDetailService;
+import com.yxt.pms.biz.pms.pmspurchasebillinvoice.PmsPurchaseBillInvoiceService;
+import com.yxt.pms.biz.pms.pmspurchasepay.PmsPurchasePayService;
+import com.yxt.pms.feign.flowable.flow.FlowableFeign;
+import com.yxt.pms.feign.flowable.flow2.FlowFeign;
+import com.yxt.pms.feign.flowable.flowtask.FlowTaskFeign;
+import com.yxt.pms.feign.message.MessageFeign;
+import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign;
+import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign;
 import org.apache.commons.lang3.StringUtils;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
@@ -61,33 +70,63 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 
 	@Autowired
 	private PmsPurchasebackDetailService pmsPurchasebackDetailService;
+	@Autowired
+	private SysOrganizationFeign sysOrganizationFeign;
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private FlowableFeign flowableFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+	@Autowired
+	private FlowFeign flowFeign;
+	@Autowired
+	private MessageFeign messageFeign;
 	
 	public PagerVo<PmsPurchasebackBillVo> listPageVo(PagerQuery<PmsPurchasebackBillQuery> pq) {
 		PmsPurchasebackBillQuery query = pq.getParams();
 		QueryWrapper<PmsPurchasebackBill> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getCreateOrgSid())){
-			qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
+		String orgPath = query.getOrgPath();
+		String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+		qw.eq("ppb.createOrgSid", createOrgSid);
+		if (StringUtils.isNotBlank(query.getCreateOrgName())) {
+			qw.like("ppb.createOrgName", query.getCreateOrgName());
+		}
+		if (StringUtils.isNotBlank(query.getDeptName())) {
+			qw.like("ppb.deptName", query.getDeptName());
+		}
+		if (StringUtils.isNotBlank(query.getCreateByName())) {
+			qw.like("ppb.createByName", query.getCreateByName());
 		}
-		if (StringUtils.isNotBlank(query.getDocumentState())){
-			qw.eq("ppb.documentState",query.getDocumentState());
+		if (StringUtils.isNotBlank(query.getBillNo())) {
+			qw.like("ppb.billNo", query.getBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getBillTypeKey())){
-			qw.eq("pb.billTypeKey",query.getBillTypeKey());
+		if (StringUtils.isNotBlank(query.getSourceBillNo())) {
+			qw.like("pb.billNo", query.getSourceBillNo());
 		}
-		if (StringUtils.isNotBlank(query.getSupplierSid())){
-			qw.eq("pb.supplierSid",query.getSupplierSid());
+		if (StringUtils.isNotBlank(query.getPurchaseTypeValue())) {
+			qw.like("pb.purchaseTypeValue", query.getPurchaseTypeValue());
 		}
-		if (StringUtils.isNotBlank(query.getArrearsState())){
-			qw.eq("ppb.arrearsState",query.getArrearsState());
+		if (StringUtils.isNotBlank(query.getPurchaseReasonValue())) {
+			qw.like("pb.purchaseReasonValue", query.getPurchaseReasonValue());
 		}
-		if (StringUtils.isNotBlank(query.getOtherQuery())){
-			qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
+		if (StringUtils.isNotBlank(query.getPayTypeValue())) {
+			qw.like("pb.payTypeValue", query.getPayTypeValue());
+		}
+		if (StringUtils.isNotBlank(query.getSupplierName())) {
+			qw.like("pb.supplierName", query.getSupplierName());
 		}
 		String createStartTime = query.getCreateStartTime();
 		String createEndTime = query.getCreateEndTime();
-		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-				apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+		qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (ppb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(createEndTime), "date_format (ppb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+				);
+		String finishStartTime = query.getFinishStartTime();
+		String finishEndTime = query.getFinishEndTime();
+		qw.apply(StringUtils.isNotEmpty(finishStartTime), "date_format (ppb.finishTime,'%Y-%m-%d') >= date_format('" + finishStartTime + "','%Y-%m-%d')").
+				apply(StringUtils.isNotEmpty(finishEndTime), "date_format (ppb.finishTime,'%Y-%m-%d') <= date_format('" + finishEndTime + "','%Y-%m-%d')"
 				);
+		qw.groupBy("ppb.sid");
 		IPage<PmsPurchasebackBill> page = PagerUtil.queryToPage(pq);
 		IPage<PmsPurchasebackBillVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<PmsPurchasebackBillVo> p = PagerUtil.pageToVo(pagging, null);
@@ -146,36 +185,4 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 			pmsPurchasebackDetailService.delByMainSid(sid);
 		}
 	}
-
-	public List<PmsPurchasebackBillExcelVo> listExcel(PmsPurchasebackBillQuery query) {
-		QueryWrapper<PmsPurchasebackBillExcelVo> qw = new QueryWrapper<>();
-		if (query != null){
-			if (StringUtils.isNotBlank(query.getCreateOrgSid())){
-				qw.eq("ppb.createOrgSid",query.getCreateOrgSid());
-			}
-			if (StringUtils.isNotBlank(query.getDocumentState())){
-				qw.eq("ppb.documentState",query.getDocumentState());
-			}
-			if (StringUtils.isNotBlank(query.getBillTypeKey())){
-				qw.eq("pb.billTypeKey",query.getBillTypeKey());
-			}
-			if (StringUtils.isNotBlank(query.getSupplierSid())){
-				qw.eq("pb.supplierSid",query.getSupplierSid());
-			}
-			if (StringUtils.isNotBlank(query.getArrearsState())){
-				qw.eq("ppb.arrearsState",query.getArrearsState());
-			}
-			if (StringUtils.isNotBlank(query.getOtherQuery())){
-				qw.and(wrapper -> wrapper.like("ppb.billNo", query.getOtherQuery()).or().like("pb.supplierPhone", query.getOtherQuery()).or().like("ppb.remarks",query.getOtherQuery()));
-			}
-			String createStartTime = query.getCreateStartTime();
-			String createEndTime = query.getCreateEndTime();
-			qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (pb.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
-					apply(StringUtils.isNotEmpty(createEndTime), "date_format (pb.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
-					);
-		}
-		List<PmsPurchasebackBillExcelVo> list = baseMapper.listExcel(qw);
-		list.removeAll(Collections.singleton(null));
-		return list;
-	}
 }

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

@@ -55,24 +55,32 @@ public class PmsPurchasebackBillVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("流程状态")
+    private String nodeState;
     @ApiModelProperty("单据编号")
     private String billNo;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+    @ApiModelProperty("创建组织名称")
+    private String createOrgName;
+    @ApiModelProperty("申请部门名称")
+    private String deptName;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
     @ApiModelProperty("创建时间")
     private Date createTime;
+    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @ApiModelProperty("办结时间")
+    private Date finishTime;
     @ApiModelProperty("来源单编号")
     private String sourceBillNo;
+    @ApiModelProperty("采购类型Value（厂家采购、外采、其他）")
+    private String purchaseTypeValue;
+    @ApiModelProperty("采购原因（储备/客户订单/在修车辆）")
+    private String purchaseReasonValue;
+    @ApiModelProperty("付款方式value（预付款/月结/单笔付款）")
+    private String payTypeValue;
     @ApiModelProperty("供应商名称")
     private String supplierName;
-    @ApiModelProperty("供应商联系电话")
-    private String supplierPhone;
-    @ApiModelProperty("采购员姓名")
-    private String purchaserName;
-    @ApiModelProperty("库管员姓名")
-    private String storekeeperName;
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
-    @ApiModelProperty("结算时间")
-    private Date settleTime;
-    @ApiModelProperty("票据类型value(不含税、增值税、普通税、已含增值税)")
-    private String billTypeValue;
+    @ApiModelProperty("退货金额")
+    private String backAmountCount;
+    @ApiModelProperty("应收金额")
+    private String receivableAmount;
 }

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

@@ -110,7 +110,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String purchaserName;
     @ApiModelProperty("预计到货日期")
     @JsonFormat(
-            pattern = "yyyy-MM-dd",
+            pattern = "yyyy-MM-dd HH:mm:ss",
             timezone = "GMT+8"
     )
     private Date deliveryDate;
@@ -140,7 +140,7 @@ public class PmsPurchaseBillDetailsVo implements Vo {
     private String nodeState; // 流程状态
     @ApiModelProperty("任务id")
     private String taskId; // 任务id
-    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     @ApiModelProperty("办结时间")
     private Date finishTime; // 办结时间
 

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillMapper.xml

@@ -18,7 +18,9 @@
 		ppb.`supplierName`,
 		IF(ppbi.`isInvoicing` = 1, '是','否') AS isInvoicing,
 		SUM(ppbd.`amount`) AS amountCount,
-		ppb.`payableAmount`
+		ppb.`payableAmount`,
+		ppb.procDefId,
+		ppb.procInstId
 		FROM
 		pms_purchase_bill ppb
 		LEFT JOIN pms_purchase_bill_invoice ppbi
@@ -38,7 +40,10 @@
 
 	<update id="updateFlowFiled">
 		UPDATE pms_purchase_bill
-		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}, finishTime = NOW()
+		SET nodeState=#{nodeState}, nodeId=#{taskDefKey}
+		<if test="nodeState == '已办结' or nodeState == '终止'">
+			, finishTime = NOW()
+		</if>
 		<if test="procDefId != null and procDefId != ''">
 			, procDefId=#{procDefId}
 		</if>

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

@@ -26,6 +26,7 @@
 package com.yxt.pms.biz.pms.pmspurchasebill;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;

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

@@ -83,4 +83,8 @@ public class PmsPurchaseBillVo implements Vo {
     private BigDecimal amountCount;
     @ApiModelProperty("应付金额（=采购金额+运费-优惠金额）")
     private BigDecimal payableAmount;
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
 }

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

@@ -54,95 +54,80 @@ import java.util.List;
 @Service
 public class PmsPurchaseBillDetailService extends MybatisBaseService<PmsPurchaseBillDetailMapper, PmsPurchaseBillDetail> {
 
-	public PagerVo<PmsPurchaseBillDetailVo> listPageVo(PagerQuery<PmsPurchaseBillDetailQuery> pq) {
-		PmsPurchaseBillDetailQuery query = pq.getParams();
-		QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
-		IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
-		IPage<PmsPurchaseBillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
-		PagerVo<PmsPurchaseBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	
-	public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
-	}
-	
-	public void insertByDto(PmsPurchaseBillDetailDto dto){
-		PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail();
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.insert(entity);
-	}
-	
-	public void updateByDto(PmsPurchaseBillDetailDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchaseBillDetail entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
-	public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid){
-		PmsPurchaseBillDetail entity = fetchBySid(sid);
-		PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo();
-		BeanUtil.copyProperties(entity, vo);
-		return vo;
-	}
+    public PagerVo<PmsPurchaseBillDetailVo> listPageVo(PagerQuery<PmsPurchaseBillDetailQuery> pq) {
+        PmsPurchaseBillDetailQuery query = pq.getParams();
+        QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
+        IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<PmsPurchaseBillDetailVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<PmsPurchaseBillDetailVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 
-	public void delByMainSid(String dtoSid) {
-		baseMapper.delByMainSid(dtoSid);
-	}
+    public void saveOrUpdateDto(PmsPurchaseBillDetailDto dto) {
+        this.insertByDto(dto);
+    }
 
-	public List<PmsPurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
-		return baseMapper.selByMainSid(billSid);
-	}
+    public void insertByDto(PmsPurchaseBillDetailDto dto) {
+        PmsPurchaseBillDetail entity = new PmsPurchaseBillDetail();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
 
-	public PagerVo<PmsPurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
-		PmsPurchaseBillDetailReportQuery query = pq.getParams();
-		QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getWarehouseName())){
-			qw.like("pdd.warehouseName",query.getWarehouseName());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSkuCode())){
-			qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){
-			qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSpuName())){
-			qw.like("pdd.goodsSpuName",query.getGoodsSpuName());
-		}
-		IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
-		IPage<PmsPurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
-		PagerVo<PmsPurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
+    public PmsPurchaseBillDetailDetailsVo fetchDetailsVoBySid(String sid) {
+        PmsPurchaseBillDetail entity = fetchBySid(sid);
+        PmsPurchaseBillDetailDetailsVo vo = new PmsPurchaseBillDetailDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        return vo;
+    }
 
-	public PagerVo<PmsPurchaseBillDetailSumVo> purSumReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
-		PmsPurchaseBillDetailReportQuery query = pq.getParams();
-		QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
-		if (StringUtils.isNotBlank(query.getWarehouseName())){
-			qw.like("pdd.warehouseName",query.getWarehouseName());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSkuCode())){
-			qw.like("pdd.goodsSkuCode",query.getGoodsSkuCode());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())){
-			qw.like("pdd.goodsSkuOwnSpec",query.getGoodsSkuOwnSpec());
-		}
-		if (StringUtils.isNotBlank(query.getGoodsSpuName())){
-			qw.like("pdd.goodsSpuName",query.getGoodsSpuName());
-		}
-		qw.groupBy("pdd.goodsSkuCode");
-		IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
-		IPage<PmsPurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
-		PagerVo<PmsPurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
+    public void delByMainSid(String dtoSid) {
+        baseMapper.delByMainSid(dtoSid);
+    }
+
+    public List<PmsPurchaseBillDetailDetailsVo> selByMainSid(String billSid) {
+        return baseMapper.selByMainSid(billSid);
+    }
+
+    public PagerVo<PmsPurchaseBillDetailReportVo> purDetailReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
+        PmsPurchaseBillDetailReportQuery query = pq.getParams();
+        QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getWarehouseName())) {
+            qw.like("pdd.warehouseName", query.getWarehouseName());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
+            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
+        }
+        IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<PmsPurchaseBillDetailReportVo> pagging = baseMapper.purDetailReForm(page, qw);
+        PagerVo<PmsPurchaseBillDetailReportVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public PagerVo<PmsPurchaseBillDetailSumVo> purSumReForm(PagerQuery<PmsPurchaseBillDetailReportQuery> pq) {
+        PmsPurchaseBillDetailReportQuery query = pq.getParams();
+        QueryWrapper<PmsPurchaseBillDetail> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getWarehouseName())) {
+            qw.like("pdd.warehouseName", query.getWarehouseName());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("pdd.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuOwnSpec())) {
+            qw.like("pdd.goodsSkuOwnSpec", query.getGoodsSkuOwnSpec());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSpuName())) {
+            qw.like("pdd.goodsSpuName", query.getGoodsSpuName());
+        }
+        qw.groupBy("pdd.goodsSkuCode");
+        IPage<PmsPurchaseBillDetail> page = PagerUtil.queryToPage(pq);
+        IPage<PmsPurchaseBillDetailSumVo> pagging = baseMapper.purSumReForm(page, qw);
+        PagerVo<PmsPurchaseBillDetailSumVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebillinvoice/PmsPurchaseBillInvoiceService.java

@@ -52,6 +52,7 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchaseBillInvoiceMapper, PmsPurchaseBillInvoice> {
+
 	private QueryWrapper<PmsPurchaseBillInvoice> createQueryWrapper(PmsPurchaseBillInvoiceQuery query) {
 		// todo: 这里根据具体业务调整查询条件
 		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -69,12 +70,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
 	}
 	
 	public void saveOrUpdateDto(PmsPurchaseBillInvoiceDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
+		this.insertByDto(dto);
 	}
 	
 	public void insertByDto(PmsPurchaseBillInvoiceDto dto){
@@ -82,17 +78,7 @@ public class PmsPurchaseBillInvoiceService extends MybatisBaseService<PmsPurchas
 		BeanUtil.copyProperties(dto, entity, "id", "sid");
 		baseMapper.insert(entity);
 	}
-	
-	public void updateByDto(PmsPurchaseBillInvoiceDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchaseBillInvoice entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		baseMapper.updateById(entity);
-	}
-	
+
 	public PmsPurchaseBillInvoiceDetailsVo fetchDetailsVoBySid(String sid){
 		PmsPurchaseBillInvoice entity = fetchBySid(sid);
 		PmsPurchaseBillInvoiceDetailsVo vo = new PmsPurchaseBillInvoiceDetailsVo();

yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasepay/PmsPurchasePayService.java

@@ -77,12 +77,7 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
 	}
 	
 	public void saveOrUpdateDto(PmsPurchasePayDto dto){
-        String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            this.insertByDto(dto);
-            return; 
-        } 
-		this.updateByDto(dto);
+		this.insertByDto(dto);
 	}
 	
 	public void insertByDto(PmsPurchasePayDto dto){
@@ -98,23 +93,6 @@ public class PmsPurchasePayService extends MybatisBaseService<PmsPurchasePayMapp
 		baseMapper.insert(entity);
 	}
 	
-	public void updateByDto(PmsPurchasePayDto dto){
-          String dtoSid = dto.getSid();
-        if (StringUtils.isBlank(dtoSid)) {
-            return;
-        } 
-		PmsPurchasePay entity = fetchBySid(dtoSid);
-		BeanUtil.copyProperties(dto, entity, "id", "sid");
-		List<PmsPurchasePayFile> filePaths = dto.getFilePaths();
-		String url = "";
-		for (PmsPurchasePayFile pmsPurchasePayFile : filePaths) {
-			String filePath = pmsPurchasePayFile.getUrl().replace(fileUploadComponent.getUrlPrefix(), "");
-			url = url + filePath + ",";
-		}
-		entity.setFilePath(url);
-		baseMapper.updateById(entity);
-	}
-	
 	public PmsPurchasePayDetailsVo fetchDetailsVoBySid(String sid){
 		PmsPurchasePay entity = fetchBySid(sid);
 		PmsPurchasePayDetailsVo vo = new PmsPurchasePayDetailsVo();