更改

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementDetailVo.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
+
+public class VehicleBusinessFileManagementDetailVo {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementFeign.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@FeignClient(
+        contextId = "anrui-buscenter-VehicleBusinessFileManagement",
+        name = "anrui-buscenter",
+        path = "v1/vehicleBusinessFileManagement")
+public interface VehicleBusinessFileManagementFeign {
+
+
+    /*@ApiOperation("车辆业务档案管理列表")
+    @PostMapping("/listPage")
+    public ResultBean<PagerVo<VehicleBusinessFileManagementVo>> listPage(@RequestBody PagerQuery<VehicleBusinessFileManagementQuery> pq);*/
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementQuery.java

@@ -0,0 +1,4 @@
+package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
+
+public class VehicleBusinessFileManagementQuery {
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/vehicleBusinessFileManagement/VehicleBusinessFileManagementVo.java

@@ -0,0 +1,85 @@
+package com.yxt.anrui.buscenter.api.vehicleBusinessFileManagement;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class VehicleBusinessFileManagementVo {
+
+    /**
+     * 车架号
+     */
+    private String vinNo;
+    /**
+     * 车型
+     */
+    private String modelName;
+    /**
+     * 销售订单编号
+     */
+    private String saleOrderNo;
+    /**
+     * 买卖合同编号
+     */
+    private String contractNo;
+    /**
+     * 付款方式
+     */
+    private String payType;
+    /**
+     * 业务类型
+     */
+    private String businessType;
+    /**
+     * 客户名称
+     */
+    private String customerName;
+    /**
+     * 客户电话
+     */
+    private String customerPhone;
+    /**
+     * 销售合同价
+     */
+    private String salePrice;
+    /**
+     * 开票单位
+     */
+    private String invoiceTitle;
+    /**
+     * 开票类型
+     */
+    private String invoiceType;
+    /**
+     * 出库日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date outBoundDate;
+    /**
+     * 交款金额
+     */
+    private String paymentAmount;
+    /**
+     * 欠款金额
+     */
+    private String arrearsMoney;
+    /**
+     * 业务状态
+     */
+    private String businessStatus;
+    /**
+     * 分公司
+     */
+    private String orgName;
+    /**
+     * 销售部门
+     */
+    private String sellDept;
+    /**
+     * 销售专员
+     */
+    private String staffName;
+}

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

@@ -27,6 +27,8 @@ public class GoodsSkuVo {
     private String manufacturerSid;
     @ApiModelProperty("厂家名称")
     private String manufacturerName;
+    @ApiModelProperty("库存数量")
+    private String count;
 
    /* @ApiModelProperty("仓库sid")
     private String warehouseSid;

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

@@ -412,7 +412,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService<PmsPurchaseba
 					inventoryRecordDto.setGoodsSkuCode(pmsPurchasebackDetailDetailsVo.getGoodsSkuCode());
 					inventoryRecordDto.setGoodsSkuOwnSpec(pmsPurchasebackDetailDetailsVo.getGoodsSkuOwnSpec());
 					inventoryRecordDto.setUnit(pmsPurchasebackDetailDetailsVo.getUnit());
-					inventoryRecordDto.setCount(pmsPurchasebackDetailDetailsVo.getCount().toString());
+					inventoryRecordDto.setCount(pmsPurchasebackDetailDetailsVo.getBackCount().toString());
 					inventoryRecordDto.setWarehouseSid(pmsPurchasebackDetailDetailsVo.getWarehouseSid());
 					inventoryRecordDto.setWarehouseName(pmsPurchasebackDetailDetailsVo.getWarehouseName());
 					inventoryRecordDto.setWarehouseRackSid(pmsPurchasebackDetailDetailsVo.getWarehouseRackSid());

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryRest.java

@@ -190,6 +190,12 @@ public class WmsInventoryRest {
         return wmsInventoryService.alloGoodsListPage(pq);
     }
 
+    @ApiOperation("其他出库商品分页列表")
+    @PostMapping("/otherOutGoodsListPage")
+    public ResultBean<PagerVo<WmsInventoryOtherOutSelectList>> otherOutGoodsListPage(@RequestBody PagerQuery<WmsInventoryOtherOutSelectQuery> pq) {
+        return wmsInventoryService.otherOutGoodsListPage(pq);
+    }
+
     @ApiOperation("旧件返厂商品分页列表")
     @PostMapping("/returnGoodsListPage")
     public ResultBean<PagerVo<WmsInventoryReturnSelectList>> returnGoodsListPage(@RequestBody PagerQuery<WmsInventoryReturnSelectQuery> pq) {

yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsOtheroutApplyRest.java

@@ -33,6 +33,7 @@ import com.yxt.wms.biz.inventory.wmsinventoryprofitout.flowable.*;
 import com.yxt.wms.biz.inventory.wmsotheroutapply.*;
 import com.yxt.wms.biz.inventory.wmsotheroutapply.flowable.*;
 import com.yxt.wms.feign.flowable.flow.BusinessVariables;
+import com.yxt.wms.feign.flowable.flow.ProcDefEnum;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,7 +92,6 @@ public class WmsOtheroutApplyRest {
 	public ResultBean complete(@Valid @RequestBody CompleteOtheroutDto query) {
 		BusinessVariables bv = new BusinessVariables();
 		BeanUtil.copyProperties(query, bv);
-		bv.setModelId("");
 		return wmsOtheroutApplyService.complete(bv);
 	}
 

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.java

@@ -53,6 +53,8 @@ public interface WmsInventoryMapper extends BaseMapper<WmsInventory> {
 
     IPage<WmsInventoryAlloSelectList> alloGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
 
+    IPage<WmsInventoryOtherOutSelectList> otherOutGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
+
     IPage<WmsInventoryReturnSelectList> returnGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);
 
     IPage<WmsInventoryHandleSelectList> handleGoodsListPage(IPage<WmsInventory> page, @Param(Constants.WRAPPER) QueryWrapper<WmsInventory> qw);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml

@@ -622,4 +622,29 @@
     <select id="selbyGoodsId" resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventory">
         SELECT * FROM wms_inventory  WHERE  goodsID =#{goodsID}
     </select>
+
+    <select id="otherOutGoodsListPage"
+            resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryOtherOutSelectList">
+        SELECT
+        wi.goodsID,
+        wi.goodsSpuSid,
+        wi.goodsSpuName,
+        wi.goodsSkuSid,
+        wi.goodsSkuTitle,
+        wi.goodsSkuCode,
+        wi.goodsSkuOwnSpec,
+        wi.manufacturerSid,
+        wi.manufacturerName,
+        wi.unit,
+        wi.warehouseSid,
+        wi.warehouseName,
+        wi.warehouseRackSid,
+        wi.warehouseRackCode,
+        wi.count,
+        wi.cost AS taxPrice
+        FROM wms_inventory wi
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectList.java

@@ -0,0 +1,47 @@
+package com.yxt.wms.biz.inventory.wmsinventory;
+
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class WmsInventoryOtherOutSelectList {
+
+    //sid
+    private String inventorySid;
+    //商品ID
+    private String goodsID;
+    //商品spuSid
+    private String goodsSpuSid;
+    //商品spu名称
+    private String goodsSpuName;
+    //商品skuSid
+    private String goodsSkuSid;
+    //商品sku名称
+    private String goodsSkuTitle;
+    //图号
+    private String goodsSkuCode;
+    //规格
+    private String goodsSkuOwnSpec;
+    //厂家sid
+    private String manufacturerSid;
+    //厂家名称
+    private String manufacturerName;
+    //商品单位
+    private String unit;
+    //仓库sid
+    private String warehouseSid;
+    //仓库名称
+    private String warehouseName;
+    //库位sid
+    private String warehouseRackSid;
+    //库位编码
+    private String warehouseRackCode;
+    //库存数量
+    private String count;
+    //入库单价
+    private String taxPrice;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryOtherOutSelectQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.wms.biz.inventory.wmsinventory;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @description:
+ * @author: dimengzhe
+ * @date: 2024/3/21
+ **/
+@Data
+public class WmsInventoryOtherOutSelectQuery implements Query {
+
+    //商品名称
+    private String goodsSkuTitle;
+    //商品编码
+    private String goodsSkuCode;
+    //部门sid
+    private String deptSid;
+}

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryService.java

@@ -467,6 +467,24 @@ public class WmsInventoryService extends MybatisBaseService<WmsInventoryMapper,
         return rb.success().setData(p);
     }
 
+    public ResultBean<PagerVo<WmsInventoryOtherOutSelectList>> otherOutGoodsListPage(PagerQuery<WmsInventoryOtherOutSelectQuery> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        WmsInventoryOtherOutSelectQuery query = pq.getParams();
+        QueryWrapper<WmsInventory> qw = new QueryWrapper<>();
+        qw.eq("wi.useOrgSid", query.getDeptSid());
+        if (StringUtils.isNotBlank(query.getGoodsSkuCode())) {
+            qw.like("wi.goodsSkuCode", query.getGoodsSkuCode());
+        }
+        if (StringUtils.isNotBlank(query.getGoodsSkuTitle())) {
+            qw.like("wi.goodsSkuTitle", query.getGoodsSkuTitle());
+        }
+        qw.gt("wi.count", 0);
+        IPage<WmsInventory> page = PagerUtil.queryToPage(pq);
+        IPage<WmsInventoryOtherOutSelectList> pagging = baseMapper.otherOutGoodsListPage(page, qw);
+        PagerVo<WmsInventoryOtherOutSelectList> p = PagerUtil.pageToVo(pagging, null);
+        return rb.success().setData(p);
+    }
+
     public ResultBean<WmsInventory> fetchEntityBySid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         WmsInventory inventory = fetchBySid(sid);

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutapply/WmsOtheroutApplyVo.java

@@ -51,6 +51,7 @@ import lombok.Data;
 @ApiModel(value = "其他出库 视图数据对象", description = "其他出库 视图数据对象")
 public class WmsOtheroutApplyVo implements Vo {
 
+	private String sid;
 	@ApiModelProperty("流程状态")
 	private String nodeState;
 	@ApiModelProperty("单据编号")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetail.java

@@ -80,8 +80,8 @@ public class WmsOtheroutDetail extends BaseEntity {
     private String warehouseName; // 仓库名称
 	@ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
-    private String warehouseRackName; // 库位名称
+	@ApiModelProperty("库位编码")
+    private String warehouseRackCode;
 	@ApiModelProperty("入库单价")
     private BigDecimal inCost; // 入库单价
 	@ApiModelProperty("出库数量")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDetailsVo.java

@@ -81,11 +81,10 @@ public class WmsOtheroutDetailDetailsVo implements Vo {
     private String warehouseName; // 仓库名称
 	@ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
-    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("库位编码")
+    private String warehouseRackCode;
 	@ApiModelProperty("入库单价")
     private BigDecimal inCost; // 入库单价
 	@ApiModelProperty("出库数量")
     private BigDecimal outCount; // 出库数量
-
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailDto.java

@@ -81,8 +81,8 @@ public class WmsOtheroutDetailDto implements Dto {
     private String warehouseName; // 仓库名称
 	@ApiModelProperty("库位sid")
     private String warehouseRackSid; // 库位sid
-	@ApiModelProperty("库位名称")
-    private String warehouseRackName; // 库位名称
+    @ApiModelProperty("库位编码")
+    private String warehouseRackCode;
 	@ApiModelProperty("入库单价")
     private BigDecimal inCost; // 入库单价
 	@ApiModelProperty("出库数量")

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.java

@@ -38,6 +38,5 @@ public interface WmsOtheroutDetailMapper extends BaseMapper<WmsOtheroutDetail> {
 	@Delete("delete from wms_otherout_detail where mainSid = #{dtoSid}")
     void delByMainSid(String dtoSid);
 
-	@Select("select * from wms_otherout_detail where mainSid = #{mainSid}")
 	List<WmsOtheroutDetailDetailsVo> selByMainSid(String mainSid);
 }

yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsotheroutdetail/WmsOtheroutDetailMapper.xml

@@ -3,4 +3,12 @@
 <mapper namespace="com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailMapper">
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
+
+    <select id="selByMainSid" resultType="com.yxt.wms.biz.inventory.wmsotheroutdetail.WmsOtheroutDetailDetailsVo">
+        SELECT
+            *
+        FROM
+            wms_otherout_detail
+        WHERE mainSid = #{mainSid}
+    </select>
 </mapper>

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

@@ -10,6 +10,7 @@ public enum ProcDefEnum {
     WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"),
     WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"),
     WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"),
+    WMSOTHEROUTAPPLY("其他出库（报损出库）", "process_iks2hour:1:14197560"),
     WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"),
     WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"),
     WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"),