问题修改

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeign.java

@@ -114,7 +114,6 @@ public interface BaseTrailerFeign {
     ResultBean<PagerVo<BaseTrailerSearchVo>> searchPage(@RequestBody PagerQuery<BaseTrailerSearchQuery> pagerQuery);
 
     @ApiOperation("挂车出库")
-    @PostMapping("/trailerOut")
+    @PostMapping("/trailerOut/{sid}")
-    @ResponseBody
+    public ResultBean trailerOut(@PathVariable("sid") String sid);
-    public ResultBean trailerOut(@RequestBody BaseTrailerDto dto);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basetrailer/BaseTrailerFeignFallback.java

@@ -78,7 +78,7 @@ public class BaseTrailerFeignFallback implements BaseTrailerFeign {
 	}
 
 	@Override
-	public ResultBean trailerOut(BaseTrailerDto dto) {
+	public ResultBean trailerOut(String sid) {
 		return null;
 	}
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDetailsVo.java

@@ -36,6 +36,8 @@ public class BaseVehicleOutDetailsVo implements Vo {
     private String customerName;
     @ApiModelProperty("客户sid")
     private String customerSid;
+    @ApiModelProperty("客户编码")
+    private String customerNo;
     @ApiModelProperty("手机号")
     private String mobile;
     @ApiModelProperty("赠品说明")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutFeign.java

@@ -45,12 +45,12 @@ public interface BaseVehicleOutFeign {
     @ApiOperation("根据层级获取分公司信息")
     @PostMapping("/selectOrgByLevel")
     @ResponseBody
-    ResultBean<List<Map<String,String>>> selectOrgByLevel(@RequestParam("orgSidPath") String orgSidPath);
+    ResultBean<List<Map<String, String>>> selectOrgByLevel(@RequestParam("orgSidPath") String orgSidPath);
 
     @ApiOperation("生成销售出库单pdf")
     @PostMapping("/createPdf")
     @ResponseBody
-    ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid);
+    ResultBean<PdfPath> createPdf(@RequestParam("xsckdSid") String xsckdSid, @RequestParam("printerType") String printerType);
 
 }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerRest.java

@@ -106,7 +106,7 @@ public class BaseTrailerRest implements BaseTrailerFeign {
 	}
 
 	@Override
-	public ResultBean trailerOut(BaseTrailerDto dto) {
+	public ResultBean trailerOut(String sid) {
-		return baseTrailerService.trailerOut(dto);
+		return baseTrailerService.trailerOut(sid);
 	}
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@@ -416,18 +416,25 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return baseMapper.fetchByVehSid(sid);
     }
 
-    public ResultBean trailerOut(BaseTrailerDto dto) {
+    public ResultBean trailerOut(String sid) {
         ResultBean rb = ResultBean.fireFail();
-        String vehSid = dto.getVehSid();
+        BaseTrailer baseTrailer = fetchBySid(sid);
+        if (baseTrailer.getStockStateKey().equals("0002")){
+            return rb.setMsg("该挂车已出库");
+        }
+        String vehSid = baseTrailer.getVehSid();
         BaseVehicle baseVehicle = baseVehicleService.fetchBySid(vehSid);
-        if (!baseVehicle.equals("0002")) {
+        String vehicleState = baseVehicle.getVehicleState();
+        if (!vehicleState.equals("0002")) {
             return rb.setMsg("此主车车辆库存状态不是出库，请重新选择");
         }
-        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(dto.getUseOrgSid(), vehSid);
+        BaseVehicleOutDetailsVo baseVehicleOutDetailsVo = baseVehicleOutService.selByOrgSidAndVehSid(baseTrailer.getUseOrgSid(), vehSid);
         BaseVehicleOut baseVehicleOut = new BaseVehicleOut();
         BeanUtil.copyProperties(baseVehicleOutDetailsVo, baseVehicleOut, "sid");
+        baseVehicleOut.setTypeKey("003");
+        baseVehicleOut.setType("上装挂车");
         String billNo = "";
-        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(dto.getUseOrgSid()).getData();
+        SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(baseTrailer.getUseOrgSid()).getData();
         String date = DateUtil.format(DateUtil.date(), "yyyyMM");
         billNo = "XSCKD" + sysOrganizationVo.getOrgCode() + date;
         String i = baseMapper.selectNum(billNo);
@@ -439,7 +446,19 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         baseVehicleOut.setBillNo(billNo);
         baseVehicleOut.setTrailerOrInstallMGroupCode("99.02");
         baseVehicleOut.setTrailerOrInstallMGroupName("挂车");
-        baseVehicleOut.setTrailerOrInstallCode(dto.getVinNo().substring(dto.getVinNo().length() - 8) + "G");
+        baseVehicleOut.setTrailerOrInstallCode(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
+        baseVehicleOut.setSzOrGCSid(baseTrailer.getSid());
+        baseVehicleOut.setTrailerOrInstallName("挂车");
+        BaseTrailerModel baseTrailerModel = baseTrailerModelService.fetchBySid(baseTrailer.getTrailerModelSid());
+        String appearanceSizeLong = baseTrailerModel.getAppearanceSizeLong();
+        String appearanceSizeWide = baseTrailerModel.getAppearanceSizeWide();
+        String appearanceSizeHigh = baseTrailerModel.getAppearanceSizeHigh();
+        String appearanceSizeTotalHigh = baseTrailerModel.getAppearanceSizeTotalHigh();
+        String trailerTypeValue = baseTrailerModel.getTrailerTypeValue();
+        StringBuilder trailerModel = new StringBuilder();
+        trailerModel.append(trailerTypeValue).append("(").append("长").append(appearanceSizeLong).append("mm，").append("宽").append(appearanceSizeWide).append("mm，").append("高").append(appearanceSizeHigh).append("mm，").append("总高").append(appearanceSizeTotalHigh).append("mm").append(")");
+        baseVehicleOut.setTrailerOrInstall(trailerModel.toString());
+        baseVehicleOut.setTrailerOrInstallDealPrice(baseTrailerModel.getSaleGuidancePrice());
         //备注
         String remarks1 = createRemarks(baseVehicleOut);
         String remarks2 = baseVehicleOut.getRemarks();
@@ -474,14 +493,12 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         //保存车辆出库单子表
         baseVehicleOutService.save(baseVehicleOut);
         //推送金蝶挂车销售出库单
-        SalOutStock salOutStock = createSzOrGcSalOutStock(dto,baseVehicle,baseVehicleOut);
+        SalOutStock salOutStock = createSzOrGcSalOutStock(baseTrailer,baseVehicle,baseVehicleOut);
         finKingDeeFeign.draftSalOutStock(salOutStock);
         List<SalOutStock.FEntity> fEntity = salOutStock.getFEntity();
         for (SalOutStock.FEntity entity : fEntity) {
             String substring = entity.getFMaterialID().substring(entity.getFMaterialID().length() - 1);
             if ("G".equals(substring)) {
-                String gcSid = baseVehicleOut.getSzOrGCSid();
-                BaseTrailer baseTrailer = fetchBySid(gcSid);
                 baseTrailer.setStockStateKey(VehicleState.StockEnum.OUT_STOCK.getCode());
                 baseTrailer.setStockStateValue(VehicleState.StockEnum.OUT_STOCK.getRemarks());
                 BigDecimal dealPrice = new BigDecimal(baseVehicleOut.getTrailerOrInstallDealPrice());
@@ -525,7 +542,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         return note;
     }
 
-    private SalOutStock createSzOrGcSalOutStock(BaseTrailerDto baseTrailerDto, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) {
+    private SalOutStock createSzOrGcSalOutStock(BaseTrailer baseTrailer, BaseVehicle baseVehicle, BaseVehicleOut baseVehicleOut) {
         SalOutStock salOutStock = new SalOutStock();
         //单据编号
         salOutStock.setFBillNo(baseVehicleOut.getBillNo());
@@ -559,7 +576,7 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
         //单价
         fEntity.setFPrice(baseVehicleOut.getTrailerOrInstallDealPrice());
         //物料编码
-        fEntity.setFMaterialID(baseTrailerDto.getVinNo().substring(baseTrailerDto.getVinNo().length() - 8) + "G");
+        fEntity.setFMaterialID(baseTrailer.getVinNo().substring(baseTrailer.getVinNo().length() - 8) + "G");
         //仓库id
         fEntity.setFStockID(baseVehicle.getLocationCode());
         fEntityList.add(fEntity);

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java

@@ -445,6 +445,7 @@ public class BaseVehicleRest implements BaseVehicleFeign {
             StkInStock stkInStock = new StkInStock();
             BaseVehicleDto baseVehicle = dto.get(0);
             BasePurchaseSystemDetailsVo basePurchaseSystemDetailsVo = basePurchaseSystemService.fetchDetailsByDeptSid(baseVehicle.getPurchaseSystemSid()).getData();
+            //获取采购系统中的财务编码
             if (basePurchaseSystemDetailsVo != null) {
                 stkInStock.setFPurchaseOrgId(basePurchaseSystemDetailsVo.getOrgCode());
                 stkInStock.setTOrgId(basePurchaseSystemDetailsVo.getOrgCode());

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

@@ -110,6 +110,6 @@
         FROM base_vehicle_out
         WHERE createOrgSid = #{useOrgSid}
           AND vinSid = #{vehSid}
-          AND type = "001"
+        limit 1
     </select>
 </mapper>

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

@@ -53,9 +53,9 @@ public class BaseVehicleOutRest implements BaseVehicleOutFeign {
     }
 
     @Override
-    public ResultBean<PdfPath> createPdf(String xsckdSid) {
+    public ResultBean<PdfPath> createPdf(String xsckdSid,String printerType) {
         ResultBean rb = ResultBean.fireFail();
-        PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid);
+        PdfPath pdf = baseVehicleOutService.createPdf(xsckdSid,printerType);
         return rb.success().setData(pdf);
     }
 }

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

@@ -792,7 +792,7 @@ public class BaseVehicleOutService extends MybatisBaseService<BaseVehicleOutMapp
         return rb.success().setData(maps);
     }
 
-    public PdfPath createPdf(String xsckdSid) {
+    public PdfPath createPdf(String xsckdSid,String printerType) {
         PdfPath pdfPath = new PdfPath();
         //获取销售出库单信息
         BaseVehicleOutApply baseVehicleOutApply = baseVehicleOutApplyService.fetchBySid(xsckdSid);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -215,7 +215,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         kingDeeOrgAndDeptCode.setOrgCode(stkInStock.getFPurchaseOrgId());
         kingDeeOrgAndDeptCode.setDeptCode(stkInStock.getFPurchaseDeptId());
         kingDeeOrgAndDeptCode.setOtherCode(stkInStock.getFSupplierId());
-        kingDeeOrgAndDeptCode = KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
+        KingDeeUtils.orgAndDeptCodeMerge(kingDeeOrgAndDeptCode);
         stkInStock.setFPurchaseOrgId(kingDeeOrgAndDeptCode.getOrgCode());
         stkInStock.setFPurchaseDeptId(kingDeeOrgAndDeptCode.getDeptCode());
         stkInStock.setFSupplierId(kingDeeOrgAndDeptCode.getOtherCode());

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -7,7 +7,7 @@ public enum ProcDefEnum {
 
     /***************************正式流程id***********************************/
 
-    /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:727504"),//TODO：正式新2022-11-25
@@ -38,12 +38,12 @@ public enum ProcDefEnum {
     SCMCOLLECTIONREBATEWITHAPPLY("回款返利预提申请", "process_k4lodiyg:1:630004"),
     SCMCOLLECTIONREBATECHECKAPPLY("回款返利核对申请", "process_fgrv1mbv:1:630008"),
     CONTRACTAPPLY("合同审核", "process_gd8c9xd5:1:545008"),
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),*/
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),
 
 
     /******************************测试流程id*********************************************/
 
-    ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
+    /*ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_pkyns85b:4:575004"),
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
     RECORDAPPLICATION("入库申请", "process_xbwq2c7p:3:675024"),
@@ -74,7 +74,7 @@ public enum ProcDefEnum {
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
-    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id*/
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {