船运问题修改2

YYC

2023-10-19 723f54708d7c2b71f916e40952ebc818629e66ab

船运问题修改2

 igds-core/src/main/java/com/ld/igds/models/SecCamera.java

@@ -116,6 +116,14 @@
    @PropertyDef(label = "更新时间")
    private Date updateTime;

    @Column(name = "spjklx", length = 1)
    @PropertyDef(label = "视频监控类型")
    private String spjklx;

    @Column(name = "spdwlx", length = 2)
    @PropertyDef(label = "视频监控类型")
    private String spdwlx;

    public int getChanNum() {
        return chanNum;
    }

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager2.java

@@ -15,6 +15,7 @@
import com.ld.igds.inout.dto.InoutParam;
import com.ld.igds.inout.dto.InoutRecordItemData;
import com.ld.igds.inout.dto.InoutRecordItemParam;
import com.ld.igds.inout.mapper.InoutRecordMapper;
import com.ld.igds.inout.service.InoutRecordItemService;
import com.ld.igds.inout.service.InoutService;
import com.ld.igds.m.dto.NoticeParam;
@@ -59,6 +60,8 @@
    private InoutCommonService inoutManagerService;
    @Resource
    private HInoutCarConfService carConfService;
    @Autowired
    private InoutRecordMapper inoutMapper;

    /**
     * 出入库流程中的实时数据，直接从缓存中获取
@@ -478,6 +481,12 @@
        if (InoutConstant.PROGRESS_RECORD.equals(data.getProgress())) {
            //说明流程已结束，重新统计数量
            inoutRecordItemService.updateNumByInoutItem(data.getRecordId());
            InoutParam param = new InoutParam();
            param.setId(data.getRecordId());
            param.setType(data.getType());
            param.setCompanyId(data.getCompanyId());
            InoutData completeData = inoutMapper.inoutQueryById(param);
            inoutService.updateInoutCache(completeData);
            return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);

        } else {
@@ -594,7 +603,8 @@
//                }
            }
        }

        InoutData completeData = inoutMapper.inoutQueryById(inoutParam);
        inoutService.updateInoutCache(completeData);
        return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), null, data);
    }


 igds-security/src/main/java/com/ld/igds/sec/view/SecCamera.view.xml

@@ -198,7 +198,7 @@
        </Property>
      </PropertyDef>
      <PropertyDef name="azwzlx">
        <Property/>
        <Property></Property>
        <Property name="label">安装位置</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
@@ -256,6 +256,110 @@
              <Entity>
                <Property name="key">99</Property>
                <Property name="value">其他</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="spjklx">
        <Property/>
        <Property name="label">监控类型</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：仓内</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：业务类</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3：安防类</Property>
              </Entity>
            </Collection>
          </Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="spdwlx">
        <Property/>
        <Property name="label">点位类型</Property>
        <Property name="mapping">
          <Property name="keyProperty">key</Property>
          <Property name="valueProperty">value</Property>
          <Property name="mapValues">
            <Collection>
              <Entity>
                <Property name="key">1</Property>
                <Property name="value">1：出入口</Property>
              </Entity>
              <Entity>
                <Property name="key">2</Property>
                <Property name="value">2：扦样机</Property>
              </Entity>
              <Entity>
                <Property name="key">3</Property>
                <Property name="value">3：化验室</Property>
              </Entity>
              <Entity>
                <Property name="key">4</Property>
                <Property name="value">4：结算室</Property>
              </Entity>
              <Entity>
                <Property name="key">5</Property>
                <Property name="value">5：地磅室</Property>
              </Entity>
              <Entity>
                <Property name="key">6</Property>
                <Property name="value">6：库区主干道</Property>
              </Entity>
              <Entity>
                <Property name="key">7</Property>
                <Property name="value">7：仓间监控</Property>
              </Entity>
              <Entity>
                <Property name="key">8</Property>
                <Property name="value">8：仓内</Property>
              </Entity>
              <Entity>
                <Property name="key">9</Property>
                <Property name="value">9：药品房内外</Property>
              </Entity>
              <Entity>
                <Property name="key">10</Property>
                <Property name="value">10：器材室内外</Property>
              </Entity>
              <Entity>
                <Property name="key">11</Property>
                <Property name="value">11：制高点</Property>
              </Entity>
              <Entity>
                <Property name="key">12</Property>
                <Property name="value">12：油库罐区</Property>
              </Entity>
              <Entity>
                <Property name="key">13</Property>
                <Property name="value">13：收发油设备</Property>
              </Entity>
              <Entity>
                <Property name="key">14</Property>
                <Property name="value">14：泵房</Property>
              </Entity>
              <Entity>
                <Property name="key">15</Property>
                <Property name="value">15：油库主要输送管道</Property>
              </Entity>
              <Entity>
                <Property name="key">16</Property>
                <Property name="value">16：周界</Property>
              </Entity>
            </Collection>
          </Property>
@@ -527,6 +631,7 @@
      <Property name="caption">监控设备信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">100%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -595,6 +700,16 @@
                <Property name="property">azwzlx</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">spjklx</Property>
                <Property name="property">spjklx</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">spdwlx</Property>
                <Property name="property">spdwlx</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </GroupBox>