问题修改

3 years ago · a09008e424
9 changed files with 54 additions and 30 deletions
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclebrand/BaseVehicleBrandFeign.java
@ -7,6 +7,7 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.*;

 import javax.validation.Valid;
@ -95,7 +96,7 @@ public interface BaseVehicleBrandFeign {
     */
    @GetMapping("/selectByOrgSid")
    @ApiOperation(value = "根据使用组织查询品牌下拉框")
-    public ResultBean<List<BaseVehicleBrandSelectVo>> selectByOrgSid(@RequestBody BaseVehicleBrandSelectQuery baseVehicleBrandSelectQuery);
+    public ResultBean<List<BaseVehicleBrandSelectVo>> selectByOrgSid(@Valid @SpringQueryMap BaseVehicleBrandSelectQuery baseVehicleBrandSelectQuery);

    @ApiOperation("根据厂商sid查询品牌列表")
    @GetMapping("/namesDownBySid")
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
@ -379,12 +379,12 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
                    baseVehicleService.updateVehicleState(VehicleState.StockEnum.NX_STOCK.getCode(), VehicleState.StockEnum.NX_STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callOutOrgSid);
                    baseVehicleService.updateVehicleState(VehicleState.StockEnum.STOCK.getCode(), VehicleState.StockEnum.STOCK.getRemarks(), baseInternalPurchaseVehicle.getVinNo(), callInOrgSid);
                }
-               try{
-                   SalOutStock salOutStock=createSalOutStock(baseAccadjApply);
-                   ResultBean<List<KingDeeResult>> listResultBean = finKingDeeFeign.draftSalOutStock(salOutStock);
-               }catch (Exception e){
-                   e.printStackTrace();
-               }
+                try {
+                    SalOutStock salOutStock = createSalOutStock(baseAccadjApply);
+                    ResultBean<List<KingDeeResult>> listResultBean = finKingDeeFeign.draftSalOutStock(salOutStock);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
            }
            return rb.success().setData(resultBean.getData());
        } else {
@ -393,9 +393,9 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
    }

    private SalOutStock createSalOutStock(BaseAccadjApply baseAccadjApply) {
-        SalOutStock salOutStock=new SalOutStock();
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        Date date=new Date();
+        SalOutStock salOutStock = new SalOutStock();
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date date = new Date();
        /**
         * 日期:FDate  (必填项)
         */
@ -407,49 +407,49 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
        /**
         * 客户:FCustomerID  (必填项)
         */
-         salOutStock.setFCustomerID(" JXYXB");
+        salOutStock.setFCustomerID(" JXYXB");
        /**
         * 销售部门:FSaleDeptID  (必填项)
         */
-         salOutStock.setFSaleDeptID("05.04");
+        salOutStock.setFSaleDeptID("05.04");
        /**
         * 发货组织:FStockOrgId  (必填项)
         */
        //salOutStock.setFStockOrgId("101");

-        List<SalOutStock.FEntity> fEntity=new ArrayList<>();
+        List<SalOutStock.FEntity> fEntity = new ArrayList<>();

-        SalOutStock.FEntity fe= new SalOutStock.FEntity();
+        SalOutStock.FEntity fe = new SalOutStock.FEntity();
        /**
         * 物料编码:FMaterialID
         */
-          fe.setFMaterialID(" JX091054");
+        fe.setFMaterialID(" JX091054");
        /**
         * 库存单位:FUnitID  (必填项)
         */
-         fe.setFUnitID("liang");
+        fe.setFUnitID("liang");
        /**
         * 实发数量:FRealQty
         */
-         fe.setFRealQty(1.0);
+        fe.setFRealQty(1.0);
        /**
         * 批号:FLot
         */
-         fe.setFlot("1233321");
+        fe.setFlot("1233321");
        /**
         * 货主:FOwnerID  (必填项)
         */
-         fe.setFOwnerID("101");
+        fe.setFOwnerID("101");
        /**
         * 仓库:FStockID
         */
-         fe.setFStockID("CK001");
+        fe.setFStockID("CK001");
        /**
         * 库存状态:FStockStatusID
         */
-         fe.setFStockStatusID("KCZT01_SYS");
+        fe.setFStockStatusID("KCZT01_SYS");
        fEntity.add(fe);
-         salOutStock.setFEntity(fEntity);
+        salOutStock.setFEntity(fEntity);
        return salOutStock;
    }

--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@ -237,6 +237,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
                baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
                baseInternalPurchaseVehicle1.setRecallStateKey(VehicleState.RecallState.UN_RECALL.getCode());
                baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
+                baseInternalPurchaseVehicle1.setIsAccadj("0");
+                baseInternalPurchaseVehicle1.setIsInvoicing("0");
                baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
            }
            return rb.success().setMsg("保存成功").setData(baseInternalPurchase.getSid());
@ -254,6 +256,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
            baseInternalPurchaseVehicle1.setSid(sid1);
            baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
            baseInternalPurchaseVehicle1.setMainSid(dtoSid);
+            baseInternalPurchaseVehicle1.setRecallStateKey(VehicleState.RecallState.UN_RECALL.getCode());
+            baseInternalPurchaseVehicle1.setRecallStateValue(VehicleState.RecallState.UN_RECALL.getRemarks());
+            baseInternalPurchaseVehicle1.setIsAccadj("0");
+            baseInternalPurchaseVehicle1.setIsInvoicing("0");
            baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
        }
        return rb.success().setMsg("修改成功").setData(dtoSid);
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseshuntinginvoicingapply/BaseShuntingInvoicingApplyService.java
@ -149,17 +149,18 @@ public class BaseShuntingInvoicingApplyService extends MybatisBaseService<BaseSh
            return rb.setMsg("该调车申请单不存在");
        }
        this.updateByDto(dto);
-        List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(dtoSid);
+        //List<BaseShuntingInvoicinApplyeVehDetailsVo> baseShuntingInvoicinApplyeVehDetailsVos = baseShuntingInvoicinApplyeVehService.fetchByMainSid(dtoSid);
        baseShuntingInvoicinApplyeVehService.delByMainSid(dtoSid);
-        for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
+        //for (BaseShuntingInvoicinApplyeVehDetailsVo baseShuntingInvoicinApplyeVehDetailsVo : baseShuntingInvoicinApplyeVehDetailsVos) {
            for (BaseShuntingInvoicinApplyeVehDto baseShuntingInvoicinApplyeVeh : baseShuntingInvoicinApplyeVehs) {
                BaseShuntingInvoicinApplyeVeh baseShuntingInvoicinApplyeVeh1 = new BaseShuntingInvoicinApplyeVeh();
+                String sid = baseShuntingInvoicinApplyeVeh1.getSid();
                BeanUtil.copyProperties(baseShuntingInvoicinApplyeVeh, baseShuntingInvoicinApplyeVeh1);
-                baseShuntingInvoicinApplyeVeh1.setSid(baseShuntingInvoicinApplyeVehDetailsVo.getSid());
+                baseShuntingInvoicinApplyeVeh1.setSid(sid);
                baseShuntingInvoicinApplyeVeh1.setMainSid(dtoSid);
                baseShuntingInvoicinApplyeVehService.save(baseShuntingInvoicinApplyeVeh1);
            }
-        }
+       // }
        return rb.success().setMsg("修改成功").setData(dtoSid);
    }

--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
@ -150,7 +150,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
        QueryWrapper<BaseVehicleBrandSelectVo> qw = new QueryWrapper<>();
        if (query != null) {
            if (StringUtils.isNotBlank(query.getOrgSid())) {
-                qw.eq("bvb.useOrg", query.getOrgSid());
+                qw.like("bvb.useOrg", query.getOrgSid());
            }
            if (StringUtils.isNotBlank(query.getName())) {
                qw.like("bvb.brandName", query.getName());
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.java
@ -65,4 +65,6 @@ public interface BaseVehinstallModpriceMapper extends BaseMapper<BaseVehinstallM
 	List<BaseVehinstallModpriceVo> selectListVo();

    int updateFlowFiled(Map<String, Object> beanToMap);
+
+    int selectBySid(String join);
 }
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceMapper.xml
@ -25,4 +25,11 @@
 		</if>
 		WHERE sid=#{sid}
    </update>
+
+	<select id="selectBySid" resultType="int">
+		SELECT COUNT(*)
+		FROM base_vehinstall_modprice
+		WHERE nodeState != '待提交'
+		  and find_in_set(sid, #{list})
+    </select>
 </mapper>
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehinstallmodprice/BaseVehinstallModpriceService.java
@ -177,6 +177,11 @@ public class BaseVehinstallModpriceService extends MybatisBaseService<BaseVehins

    public ResultBean delAll(String[] sids) {
        ResultBean rb = ResultBean.fireFail();
+        //查询该sid中是否有流程不是待提交的
+        int count = baseMapper.selectBySid(StringUtils.join(sids, ","));
+        if (count > 0) {
+            return rb.setMsg("删除的数据中包含已经提交审批的数据，删除失败");
+        }
        delBySids(sids);
        for (String sid : sids) {
            baseVehinstallModpricedetailService.delByMainSid(sid);
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationService.java
@ -318,9 +318,11 @@ public class SysOrganizationService extends MybatisBaseService<SysOrganizationMa
                String[] orgSidss = useOrg.split(",");
                for (String sidss : orgSidss) {
                    if (!orgSids.contains(sidss)) {
-                        orgSids.add(sidss);
-                        SysOrgVo sysOrgVo = baseMapper.getListOrgByBrand(sidss);
-                        list.add(sysOrgVo);
+                        if (!orgSid.equals(sidss)) {
+                            orgSids.add(sidss);
+                            SysOrgVo sysOrgVo = baseMapper.getListOrgByBrand(sidss);
+                            list.add(sysOrgVo);
+                        }
                    }
                }
            }