获取销售订单出库的初始化

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleout/BaseVehicleOutService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.base.api.basedistributor.BaseDistributorExportVo;
 import com.yxt.anrui.base.api.basemiddleman.BaseMiddleman;
 import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
 import com.yxt.anrui.base.api.basetrailer.BaseTrailer;
@@ -30,7 +29,6 @@ import com.yxt.anrui.base.biz.commoncontract.CommonContractService;
 import com.yxt.anrui.base.common.enums.VehicleState;
 import com.yxt.anrui.base.common.utils.Rule;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
@@ -142,9 +140,9 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
                 ResultBean<CommonContract> commonContract = commonContractService.selectByNo(dto.getConcatNo());
                 if (commonContract.getSuccess()) {
                     //查询合同编号和车辆sid客户的临时编码
-                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid());
+                    ResultBean<String> stringResultBean = busSalesOrderFeign.selectTemporaryNo(dto.getVinSid(),dto.getConcatNo());
                     if (!stringResultBean.getSuccess()) {
-                        return rb.setMsg("请检查合同是否审核");
+                        return rb.setMsg("请检查合同是否存在");
                     }
                     String temporaryNo = stringResultBean.getData();
 //                Boolean aBoolean1 = finKingDeeFeign.customerExistState(dto.getCustomerNo()).getData();

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java

@@ -277,7 +277,7 @@ public interface BusSalesOrderFeign {
     @ApiOperation(value = "查询客户的临时编码")
     @GetMapping("/selectTemporaryNo")
     @ResponseBody
-    ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid);
+    ResultBean<String> selectTemporaryNo(@RequestParam("vehSid")String vehSid, @RequestParam("contractNo")String contractNo);
 
     @ApiOperation(value = "出库初始化，根据车辆sid查询销售订单是否存在，若存在返回相关数据")
     @GetMapping("/selectOrderOne")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeignFallback.java

@@ -251,7 +251,7 @@ public class BusSalesOrderFeignFallback implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid,String contractNo) {
         return null;
     }
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.java

@@ -192,7 +192,7 @@ public interface BusSalesOrderMapper extends BaseMapper<BusSalesOrder> {
 
     OrderRemarksVo getOrderRemarksInfo(String saleOrderSid);
 
-    BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid);
+    BusSalesOrdeVo selectTemporaryNo(@Param("vehSid") String vehSid,@Param("contractNo") String contractNo);
 
     /**
      * 根据车辆sid查询销售订单的数据

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -342,7 +342,8 @@
         from bus_sales_order bo
                  left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
-          and bv.linkSid = #{vehSid}
+          and bv.linkSid = #{vehSid} and bo.contractNo = #{contractNo}
+        order by bo.createTime desc
         limit 1
     </select>
 
@@ -373,6 +374,7 @@
                  left join bus_sales_order_vehicle bv on bo.sid = bv.salesOrderSid
         where bo.nodeState = '已办结'
           and bv.linkSid = #{vinSid}
+        order by bo.createTime desc
         limit 1
     </select>
 </mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java

@@ -330,8 +330,8 @@ public class BusSalesOrderRest implements BusSalesOrderFeign {
     }
 
     @Override
-    public ResultBean<String> selectTemporaryNo(String vehSid) {
-        return busSalesOrderService.selectTemporaryNo(vehSid);
+    public ResultBean<String> selectTemporaryNo(String vehSid,String contractNo) {
+        return busSalesOrderService.selectTemporaryNo(vehSid,contractNo);
     }
 
     @Override

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -4934,11 +4934,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         return rb.success();
     }
 
-    public ResultBean<String> selectTemporaryNo(String vehSid) {
+    public ResultBean<String> selectTemporaryNo(String vehSid,String contractNo) {
         ResultBean<String> rb = ResultBean.fireFail();
-        BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid);
+        BusSalesOrdeVo busSalesOrdeVo = baseMapper.selectTemporaryNo(vehSid,contractNo);
         if (busSalesOrdeVo != null) {
-            String contractNo = busSalesOrdeVo.getContractNo();
+            contractNo = busSalesOrdeVo.getContractNo();
             if (StringUtils.isBlank(contractNo)) {
                 return rb;
             }