Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeign.java

@@ -54,6 +54,16 @@ public interface BaseModelConfigFeign {
     @PostMapping("/save")
     public ResultBean save(@Valid @RequestBody BaseModelConfigDto dto);
 
+    /**
+     * 快速新增常用配置
+     *
+     * @param dto 传输对象
+     * @return
+     */
+    @ApiOperation("快速新增常用配置")
+    @PostMapping("/fastSave")
+    public ResultBean fastSave(@Valid @RequestBody BaseModelConfigDto dto);
+
     /**
      * 修改保存
      *
@@ -128,7 +138,6 @@ public interface BaseModelConfigFeign {
     /**
      * 更多配置分页列表(非本公司的)
      *
-     * @param pagerQuery
      * @return
      */
    /* @ApiOperation("更多配置分页列表(非本公司的)")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigFeignFallback.java

@@ -22,7 +22,7 @@ import java.util.Map;
  * @since 1.0
  */
 @Component
-public  class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
+public class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
 
 
     @Override
@@ -35,6 +35,11 @@ public  class BaseModelConfigFeignFallback implements BaseModelConfigFeign {
         return ResultBean.fireFail().setMsg("接口anrui-base/basemodelconfig/save无法访问");
     }
 
+    @Override
+    public ResultBean fastSave(BaseModelConfigDto dto) {
+        return null;
+    }
+
     @Override
     public ResultBean update(BaseModelConfigDto dto, String sid) {
         return null;

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/common/enums/DictCommonEnum.java

@@ -68,6 +68,7 @@ public class DictCommonEnum {
         CG_TYPE("001", "排产"),
         WC_TYPE("002", "外采"),
         MD_TYPE("003", "买断"),
+        DJ_TYPE("005", "订金"),
         ;
         private final String code;
         private final String remarks;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerMapper.xml

@@ -179,6 +179,7 @@
           and bmb.dueBankValue = '回款账户'
           and bmb.isDelete = 0
           AND bm.isDelete = 0
+          AND bmb.actualPay != ""
     </select>
 
     <select id="fetchByManBankSid" resultType="com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturer/BaseManufacturerRest.java

@@ -109,7 +109,7 @@ public class BaseManufacturerRest implements BaseManufacturerFeign {
         //删除厂商基础信息
         int count = baseManufacturerService.updateBySidIsDelete(sidList);
         //删除厂商开户行信息
-        int i = baseManufacturerBankService.updateBySidIsDelete(sidList);
+        int i = baseManufacturerBankService.deleteBySids(sidList);
         //删除厂商财务信息
         int x = baseManufacturerFinanceService.updateBySidIsDelete(sidList);
         if (count == 0) {

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufacturerbank/BaseManufacturerBankMapper.xml

@@ -70,7 +70,7 @@
                  left join base_vehicle_brand bvb on bvb.manufacturerSid = bm.sid
                  left join base_vehicle_model bvm on bvm.carBrand = bvb.sid
         where bvm.sid = #{modelSid}
-          and bmb.dueBankValue = '订金账户'
+          and bmb.dueBankValue = '订金账户' and bmb.isDelete = 0 AND BM.isDelete = 0
     </select>
 
     <select id="actualList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManActualVo">
@@ -91,7 +91,7 @@
         from base_manufacturer bm
                  left join base_manufacturer_bank bmb on bm.manBankSid = bmb.sid
         where bm.createOrg = #{createOrgSid}
-          and dueBankValue = '订金账户'
+          and dueBankValue = '订金账户' and bmb.isDelete = 0 AND BM.isDelete = 0
     </select>
 
     <select id="payList" resultType="com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo">

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@@ -774,6 +774,6 @@
         SELECT CONCAT(configName, otherConfig) configNameOther
         FROM base_model_config
         WHERE isDelete = 0
-          AND createOrg = #{createOrgSid}
+          AND createOrgSId = #{createOrgSid}
     </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigRest.java

@@ -183,6 +183,118 @@ public class BaseModelConfigRest implements BaseModelConfigFeign {
         return rb.success().setMsg("保存成功");
     }
 
+    @Override
+    public ResultBean fastSave(BaseModelConfigDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String userSid = dto.getUserSid();
+        String sid = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData().getSid();
+        BaseModelConfig entity = new BaseModelConfig();
+        dto.fillEntity(entity);
+        String configName = "";
+        //颜色
+        if (StringUtils.isNotBlank(dto.getCarColor())) {
+            configName += dto.getCarColor() + "/";
+        }
+        //缓速器
+        if (StringUtils.isNotBlank(dto.getSlowMachine())) {
+            configName += dto.getSlowMachine() + "/";
+        }
+        //后视镜
+        if (StringUtils.isNotBlank(dto.getRearViewMirror())) {
+            configName += dto.getRearViewMirror() + "/";
+        }
+        //轮胎
+        if (StringUtils.isNotBlank(dto.getTireSize())) {
+            configName += dto.getTireSize() + "/";
+        }
+        //驾驶室规格
+        if (StringUtils.isNotBlank(dto.getSpecification())) {
+            configName += dto.getSpecification() + "/";
+        }
+        //后桥
+        if (StringUtils.isNotBlank(dto.getRearAxleValue())) {
+            configName += dto.getRearAxleValue() + "/";
+        }
+        //后桥速比
+        if (StringUtils.isNotBlank(dto.getRearAxleRatio())) {
+            configName += dto.getRearAxleRatio() + "/";
+        }
+        //空调
+        if (StringUtils.isNotBlank(dto.getAirConditioner())) {
+            configName += dto.getAirConditioner() + "/";
+        }
+        //轮毂材质
+        if (StringUtils.isNotBlank(dto.getHubMaterial())) {
+            configName += dto.getHubMaterial() + "/";
+        }
+        //导流罩
+        if (StringUtils.isNotBlank(dto.getBaffleModel())) {
+            configName += dto.getBaffleModel() + "/";
+        }
+        //悬架
+        if (StringUtils.isNotBlank(dto.getSuspension())) {
+            configName += dto.getSuspension() + "/";
+        }
+        //座椅
+        if (StringUtils.isNotBlank(dto.getSeat())) {
+            configName += dto.getSeat() + "/";
+        }
+        //护轮罩
+        if (StringUtils.isNotBlank(dto.getTireCover())) {
+            configName += dto.getTireCover() + "/";
+        }
+        //鞍座
+        if (StringUtils.isNotBlank(dto.getSaddle())) {
+            configName += dto.getSaddle() + "/";
+        }
+        //轴距
+        if (StringUtils.isNotBlank(dto.getWheelbase())) {
+            configName += dto.getWheelbase() + "/";
+        }
+        //保险杠
+        if (StringUtils.isNotBlank(dto.getBumper())) {
+            configName += dto.getBumper() + "/";
+        }
+        //配置包
+        if (StringUtils.isNotBlank(dto.getConfiguringBao())) {
+            configName += dto.getConfiguringBao() + "/";
+        }
+        //独立热源
+        if (StringUtils.isNotBlank(dto.getIndependentSources())) {
+            configName += dto.getIndependentSources() + "/";
+        }
+        //燃料箱
+        if (StringUtils.isNotBlank(dto.getFuelTank())) {
+            configName += dto.getFuelTank() + "/";
+        }
+        //多媒体
+        if (StringUtils.isNotBlank(dto.getMultimedia())) {
+            configName += dto.getMultimedia() + "/";
+        }
+        //货箱
+        if (StringUtils.isNotBlank(dto.getPackingCase())) {
+            configName += dto.getPackingCase() + "/";
+        }
+        entity.setConfigName(configName);
+        configName += dto.getOtherConfig();
+        List<String> stringList = baseModelConfigService.checkByConfigName(sid);
+        for (String s : stringList) {
+            if (s.equals(configName)){
+                return rb.setMsg("该常用配置已存在");
+            }
+        }
+        entity.setCreateOrgSId(sid);
+        // 配置编码
+        int i1 = baseModelConfigService.selectCount();
+        String num = String.format("%04d", i1 + 1); // 不足4位补0
+        entity.setConfigCode(num);
+        boolean isSave = baseModelConfigService.save(entity);
+        if (!isSave) {
+            return rb.setMsg("保存失败");
+        }
+        return rb.success().setMsg("保存成功");
+    }
+
     @Override
     public ResultBean update(BaseModelConfigDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -515,8 +515,9 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                     finPaymentrecordDto.setCost(busVehicleApply.getCurrentAmount().intValue());
                     finPaymentrecordDto.setCostTitleKey(ManPurOrderType.CostTitle.DJ_COSTTITLE.getCode());
                     finPaymentrecordDto.setCostTitleValue(ManPurOrderType.CostTitle.DJ_COSTTITLE.getRemarks());
-                    finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.CG_TYPE.getCode());
-                    finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.CG_TYPE.getRemarks());
+                    finPaymentrecordDto.setCostTypeKey(DictCommonEnum.costType.DJ_TYPE.getCode());
+                    finPaymentrecordDto.setCostTypeValue(DictCommonEnum.costType.DJ_TYPE.getRemarks());
+                    finPaymentrecordDto.setPayRemark(busVehicleApply.getPayRemarks());
                     //查询收款单位和收款账号
                     List<BusVehicleApplyDetailVo> busVehicleApplyDetailList = busVehicleApplyDetailService.fetchByApplySid(busVehicleApply.getSid());
                     String modelSid = busVehicleApplyDetailList.get(0).getVehicleSid();

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@@ -76,6 +76,8 @@ public class FinPaymentrecordDto implements Dto {
     private Integer cost;
     @ApiModelProperty(value = "业务编号")
     private String busSid;
+    @ApiModelProperty(value = "付款备注")
+    private String payRemark;
 
     @ApiModelProperty("供应商编码")
     private String payCode;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/KingDeeDocumentStatus.java

@@ -0,0 +1,5 @@
+package com.yxt.anrui.fin.api.kingdee;
+
+public enum KingDeeDocumentStatus {
+    /*SAVE,SUBMIT;*/
+}

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/saloutstock/SalOutStock.java

@@ -129,19 +129,16 @@ public class SalOutStock {
         /**
          * 销售折让:F_PAEZ_Decimal3
          */ @JsonProperty("F_PAEZ_Decimal3")
-        @NotBlank
-        public String F_PAEZ_Decimal3;
+        public String F_PAEZ_Decimal3="0";
         /**
          * 赠送套餐:F_PAEZ_Decimal4
          */ @JsonProperty("F_PAEZ_Decimal4")
-        @NotBlank
-        public String F_PAEZ_Decimal4;
+        public String F_PAEZ_Decimal4="0";
         /**
          * 返利金额:F_PAEZ_Decimal
          */
         @JsonProperty("F_PAEZ_Decimal")
-        @NotBlank
-        public String F_PAEZ_Decimal;
+        public String F_PAEZ_Decimal="0";
         /**
          * 备注:FEntrynote
          */

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/stktransferdirect/StkTransferDirect.java

@@ -95,9 +95,9 @@ public class StkTransferDirect {
     @NotBlank(message = "FOwnerIdHead不能为空")
     public String FOwnerIdHead;*/
    /* 调出库存组织:FStockOutOrgId  (必填项)*/
-    @JsonProperty("FStockOutOrgId")
+   /* @JsonProperty("FStockOutOrgId")
     @NotBlank(message = "FStockOutOrgId不能为空")
-    public String FStockOutOrgId;
+    public String FStockOutOrgId;*/
     /* 调入库存组织:FStockOrgId  (必填项)*/
     @JsonProperty("FStockOrgId")
     @NotBlank(message = "FStockOrgId不能为空")
@@ -145,7 +145,7 @@ public class StkTransferDirect {
         /* 日期:FDate  (必填项)*/
         stkTransferDirect.setFDate(sdf.format(date));
         /* 调出库存组织:FStockOutOrgId  (必填项)*/
-        stkTransferDirect.setFStockOutOrgId("101");
+        //stkTransferDirect.setFStockOutOrgId("101");
         /* 调出货主类型:FOwnerTypeOutIdHead  (必填项)*/
         //stkTransferDirect.setFOwnerTypeOutIdHead("BD_OwnerOrg");
         /* 调拨类型:FTransferBizType  (必填项)*/

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

@@ -127,7 +127,10 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
      */
     @Autowired
     private CNRecpaypurposeService cNRecpaypurposeService;
-
+    /**
+     */
+    @Autowired
+    private  FinKingDeeService finKingDeeService;
     @ApiOperation("入账暂存应付单的接口")
     @PostMapping("/draftEntryBill")
     @ResponseBody
@@ -219,7 +222,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
     @Override
     public ResultBean<String> getKingDataInfoByNumber(@PathVariable("formId") String formId,
                                                       @PathVariable("number") String number) {
-        return null;// bdCustomerService.accessKingDeeInterface(formId,number);
+        return  finKingDeeService.accessKingDeeInterface(formId,number);
     }
 
     @ApiOperation("单据查询")

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

@@ -2,6 +2,8 @@ package com.yxt.anrui.fin.biz.kingdee;
 
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import com.yxt.anrui.fin.api.kingdee.KingDeeBillId;
+import com.yxt.anrui.fin.api.kingdee.KingDeeBillUrl;
 import com.yxt.anrui.fin.api.kingdee.KingDeeResult;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 import com.yxt.anrui.portal.api.sysmapping.SysMappingInfoQueryBatch;
@@ -263,6 +265,19 @@ public class FinKingDeeService {
         }
         return rb.success();
     }
+
+    public ResultBean<String> accessKingDeeInterface(String formId, String number) {
+        String getKDForNumbers = getGetKDForNumbers(formId, number);
+        try {
+            ResultBean<String> kingDataInfoByNumber = accessKingDeeInterface(formId, getKDForNumbers,
+                    KingDeeConfig.userName_administrator,KingDeeConfig.password_administrator, KingDeeBillUrl.VIEW_URL.getURL());
+            return kingDataInfoByNumber;
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return new ResultBean<String>().fail().setMsg("查询异常");
+    }
+
     /**
      * 调用金蝶接口的数据格式
      */

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/bdmaterial/data_data.json

@@ -1,6 +1,6 @@
 {
   "Creator": "",
-  "NeedUpDateFields": ["FName","FNumber","FMaterialGroup","F_PAEZ_Base"],
+  "NeedUpDateFields": [],
   "NeedReturnFields": [],
   "IsDeleteEntry": "@KD_IsDeleteEntry",
   "SubSystemId": "",

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

@@ -7,6 +7,8 @@ import com.yxt.anrui.fin.biz.kingdee.FinKingDeeService;
 import com.yxt.common.core.result.ResultBean;
 import org.springframework.stereotype.Service;
 
+import java.text.SimpleDateFormat;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -21,6 +23,8 @@ public class StkTransferDirectService extends FinKingDeeService {
     public ResultBean<String> draftStkTransferDirect(StkTransferDirect stkTransferDirect) {
         //stkTransferDirect=StkTransferDirect.createStkTransferDirect();
         ResultBean<String> rb=ResultBean.fireFail();
+        SimpleDateFormat  sdf=new SimpleDateFormat("yyyy-MM-dd");
+        stkTransferDirect.setFDate(sdf.format(new Date()));
         try {
             //业务表的主表数据集合
             Map<String,String> map_fEntityModel_= object2Map(stkTransferDirect);

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/stktransferdirect/data_FBillEntry.json

@@ -27,7 +27,7 @@
   "FBusinessDate": "@KD_FDate",
   "FOwnerTypeOutId": "BD_OwnerOrg",
   "FOwnerOutId": {
-    "FNumber": "@KD_FStockOutOrgId"
+    "FNumber": "@KD_FStockOrgId"
   },
   "FOwnerTypeId": "BD_OwnerOrg",
   "FOwnerId": {
@@ -44,10 +44,10 @@
   },
   "FKeeperTypeOutId": "BD_KeeperOrg",
   "FKeeperOutId": {
-    "FNumber": "@KD_FStockOutOrgId"
+    "FNumber": "@KD_FStockOrgId"
   },
   "FDestMaterialId": {
-    "FNUMBER": " JX091054"
+    "FNUMBER": "@KD_FMaterialId"
   },
   "FPriceUnitID": {
     "FNumber": "liang"

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspection/ScmVehiclePatrolinspection.java

@@ -71,5 +71,7 @@ public class ScmVehiclePatrolinspection extends BaseEntity {
     private String createOrgSid; // 创建组织
     @ApiModelProperty("使用组织")
     private String useOrgSid; // 使用组织
+    @ApiModelProperty("推送状态 0 未推送 1 已推送")
+    private int pushState;
 
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetDto.java

@@ -100,4 +100,6 @@ public class ScmVehiclePatrolinspectionsheetDto implements Dto {
     private String warehouseSid;
     @ApiModelProperty("存放地点")
     private String warehouse;
+    @ApiModelProperty("推送状态 0 未推送 1 已推送")
+    private int pushState;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@@ -371,10 +371,12 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             }
             if (scmApplyInboundVehicleDtos1.size() > 0){
                 scmApplyInboundDto.setVehicleList(scmApplyInboundVehicleDtos1);
+                scmApplyInboundDto.setNum(String.valueOf(scmApplyInboundVehicleDtos1.size()));
+                scmApplyInboundDto.setScmFiles(dto.getScmFiles());
                 saveOrUpdateApplyInBound(scmApplyInboundDto);
             }
             int i = Integer.parseInt(num) - scmApplyInboundVehicleDtos1.size();
-            baseMapper.updateNumBySid(String.valueOf(i),busSid);
+            baseMapper.updateNumBySid(String.valueOf(i),businessSid);
             BusinessVariables bv = new BusinessVariables();
             BeanUtil.copyProperties(dto, bv);
             bv.setOrgSidPath(orgSidPath);
@@ -427,6 +429,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
         bv.setInstanceId(entity.getProcInsId());
         if (StringUtils.isBlank(businessTaskid) && StringUtils.isBlank(dto.getTaskId())) {
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
+            dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
             saveOrUpdateApplyInBound(dto);
             ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.startProcess(bv);
             UpdateFlowFieldVo uff = resultBean1.getData();
@@ -434,6 +437,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
             return resultBean1;
         } else if (StringUtils.isNotBlank(businessTaskid) && businessTaskid.equals(dto.getTaskId())) {//只有数据一致的时候才能进行下一步
             dto.setVehicleList(scmApplyInboundVehicleDtos2);
+            dto.setNum(String.valueOf(scmApplyInboundVehicleDtos2.size()));
             saveOrUpdateApplyInBound(dto);
             bv.setTaskDefKey(entity.getTaskDefKey());
             bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleenterlibrary/ScmVehicleEnterlibraryService.java

@@ -357,7 +357,7 @@ public class ScmVehicleEnterlibraryService extends MybatisBaseService<ScmVehicle
                     StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                    stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
 //                    stkTransferDirect.setFStockOrgId("101"); //调入库存组织
-                    stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
+                   // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
                     stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
                     stkTransferDirect.setFDate(scmVehicleEnterlibrary.getInboundDate()); //日期
                     StkTransferDirect.FBillEntry fBillEntry = new StkTransferDirect.FBillEntry();

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -902,7 +902,7 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                         List<StkTransferDirect.FBillEntry> FPAYBILLENTRYs = new ArrayList<>();
                         StkTransferDirect stkTransferDirect = new StkTransferDirect();
 //                        stkTransferDirect.setFStockOutOrgId("101"); //调出库存组织
-                        stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
+                       // stkTransferDirect.setFStockOutOrgId(sysOrganizationVo.getOrgCode()); //调出库存组织
 //                        stkTransferDirect.setFStockOrgId("101"); //调入库存组织
                         stkTransferDirect.setFStockOrgId(sysOrganizationVo.getOrgCode()); //调入库存组织
                         stkTransferDirect.setFDate(simpleDateFormat.format(baseVehicleVo.getPriceDate())); //日期

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinventory/ScmVehicleInventoryService.java

@@ -367,7 +367,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
         String inventoryName = dto.getInventoryName();
         String inventoryStateKey = dto.getInventoryStateKey();
         String remarks = dto.getRemarks();
-        if (StringUtils.isBlank(inventoryStateKey)){
+        if (StringUtils.isBlank(inventoryStateKey)) {
             return rb.setMsg("请选择盘库状态");
         }
         if ("002".equals(inventoryStateKey) && StringUtils.isBlank(remarks)) {
@@ -480,6 +480,7 @@ public class ScmVehicleInventoryService extends MybatisBaseService<ScmVehicleInv
             patrolinspectionsheetDto.setUserName(dto.getLoginName());
             patrolinspectionsheetDto.setLocation(dto.getAddressCode());
             patrolinspectionsheetDto.setAddress(dto.getAddress());
+            patrolinspectionsheetDto.setPushState(1);
             scmVehiclePatrolinspectionsheetService.savePatrolinspectionsheet(patrolinspectionsheetDto);
         }
         return rb.success().setMsg("保存成功");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -46,9 +46,9 @@
             resultType="com.yxt.anrui.scm.api.scmvehpatrolinspectionmonth.VehPatrolinspectionmonthVo">
         SELECT count(*),
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.state = '1' and svp.mainSid = #{mainSid}) AS totalNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.mainSid = #{mainSid}) AS unHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '001' and svp.pushState = 1 and svp.mainSid = #{mainSid}) AS unHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '002' and svp.mainSid = #{mainSid}) AS processedNumber,
-               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS notHandledNumber,
+               (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.isDelete = 0 and svp.mainSid = #{mainSid}) AS notHandledNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '000' and svp.mainSid = #{mainSid}) AS surplusNumber,
                (SELECT count(*) FROM scm_vehicle_patrolinspection svp WHERE svp.patrolInspectionStateKey = '003' and svp.mainSid = #{mainSid}) AS normalNumber
         FROM scm_vehicle_patrolinspection svp

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -264,6 +264,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             paramsQuery.setPatrolinspectionEndDate(s[1]);
         }
         QueryWrapper<AppScmVehiclePatrolinspectionPageVo> qw = new QueryWrapper<>();
+        qw.eq("svp.isDelete", 0);
         if (StringUtils.isNotBlank(pagerQuery.getParams().getUseOrgSid())) {
             qw.eq("svp.createOrgSid", pagerQuery.getParams().getUseOrgSid());
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -441,8 +441,10 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
         scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
         scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+        scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
         scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
         scmVehiclePatrolinspection.setState(0);
+        scmVehiclePatrolinspection.setPushState(dto.getPushState());
         scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
 
         BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehpatrolinspectionmonth/ScmVehPatrolinspectionmonthService.java

@@ -241,6 +241,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                 scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
                 scmVehiclePatrolinspection.setCreateBySid(userSid);
                 scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setPushState(0);
                 scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
             }
             if (mainList.size() > 0) {
@@ -258,6 +259,7 @@ public class ScmVehPatrolinspectionmonthService extends MybatisBaseService<ScmVe
                     scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
                     scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
                     scmVehiclePatrolinspection.setCreateBySid(userSid);
+                    scmVehiclePatrolinspection.setPushState(0);
                     scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
                     ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
                     scmVehiclePatrolinspectionsheet.setDutyName(inspection.getLiableName());