ws
2023-11-13 7f5e2fe559a2c7c7f255cb8b9aa4488f988330c6
修改武汉接口
已修改19个文件
已添加3个文件
916 ■■■■■ 文件已修改
src/main/java/com/fzzy/api/utils/FileUtils.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml 607 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java 66 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java 14 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java 157 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/templates/home/home-whjl.html 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/fzzy/api/utils/FileUtils.java
@@ -40,7 +40,7 @@
     * @param filePath:文件路径
     * @return
     */
    private static byte[] file2byte(String filePath) {
    public static byte[] file2byte(String filePath) {
        byte[] buffer = null;
        try {
            File file = new File(filePath);
src/main/java/com/fzzy/api/view/repository/GbCheckItemRep.java
@@ -20,4 +20,14 @@
     */
    @Query("from GbCheckItem where bizCode like:bizCode order by code ")
    List<GbCheckItem> findByBizCode(@Param("bizCode") String bizCode);
    /**
     *
     * @param code
     * @return
     */
    @Query("from GbCheckItem where code =:code order by code ")
    List<GbCheckItem> findByCode(@Param("code") String code);
}
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1203.java
@@ -135,7 +135,7 @@
                zkj = "";
                zkl = "";
                for (Fz35CheckItem fz35CheckItem : fz35CheckItems) {
                    gbCheckList = gbCheckItemRep.findByBizCode(fz35CheckItem.getStandardId());
                    gbCheckList = gbCheckItemRep.findByCode(fz35CheckItem.getStandardId());
                    if (gbCheckList == null || gbCheckList.isEmpty()) {
                        continue;
src/main/java/com/fzzy/async/fzzy35/impl/Fzzy35Sync1208.java
@@ -128,7 +128,7 @@
                }
                //出仓完成时间
                if("1".equals(apiData.getHwzt())){
                    apiData.setCcwcsj(DateUtils.addDays(fz35DepotStore.getStoreDate(), 5));
                    apiData.setCcwcsj(fz35DepotStore.getFullDate());
                }
                //国别
                apiData.setGb("156");
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1109.view.xml
@@ -38,11 +38,12 @@
        <Property name="label">档案类型</Property>
      </PropertyDef>
      <PropertyDef name="damc">
        <Property></Property>
          <Property></Property>
        <Property name="label">档案名称</Property>
      </PropertyDef>
      <PropertyDef name="dawj">
        <Property></Property>
          <Property name="dataType">byte</Property>
          <Property></Property>
        <Property name="label">档案文件</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1114.view.xml
@@ -71,6 +71,10 @@
        <Property></Property>
        <Property name="label">更新配件信息</Property>
      </PropertyDef>
      <PropertyDef name="ysynx">
        <Property></Property>
        <Property name="label">已使用年限</Property>
      </PropertyDef>
      <PropertyDef name="wxhyxzt">
        <Property></Property>
        <Property name="label">维修后运行状态</Property>
@@ -395,6 +399,11 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ysynx</Property>
            <Property name="property">ysynx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">wxdw</Property>
            <Property name="property">wxdw</Property>
            <Editor/>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1206.view.xml
@@ -54,7 +54,7 @@
        <Property name="label">合同客户名称</Property>
      </PropertyDef>
      <PropertyDef name="htspdj">
        <Property></Property>
        <Property name="dataType">Double</Property>
        <Property name="label">合同商品单价</Property>
      </PropertyDef>
      <PropertyDef name="htspsl">
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1213.view.xml
@@ -88,10 +88,8 @@
      <PropertyDef name="sfyx">
        <Property></Property>
        <Property name="label">是否有效</Property>
        <Property name="dataType">Integer</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
@@ -587,8 +585,5 @@
      </Children>
      <Tools/>
    </Dialog>
    <ListDropDown id="listDropYN">
      <Property name="items">是,否</Property>
    </ListDropDown>
  </View>
</ViewConfig>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1221.view.xml
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,607 @@
<?xml version="1.0" encoding="UTF-8"?>
<ViewConfig>
  <Arguments/>
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.fzzy.otherview.whhpjl.dto.WhjlApi1221</Property>
      <PropertyDef name="jhid">
        <Property/>
        <Property name="label">计划ID</Property>
      </PropertyDef>
      <PropertyDef name="jhbh">
        <Property/>
        <Property name="label">计划编号</Property>
      </PropertyDef>
      <PropertyDef name="jhmc">
        <Property/>
        <Property name="label">计划名称</Property>
      </PropertyDef>
      <PropertyDef name="jlqybh">
        <Property/>
        <Property name="label">军粮企业编号</Property>
      </PropertyDef>
      <PropertyDef name="ssqymc">
        <Property/>
        <Property name="label">军粮企业名称</Property>
      </PropertyDef>
      <PropertyDef name="jgzdbh">
        <Property/>
        <Property name="label">军供站点编号</Property>
      </PropertyDef>
      <PropertyDef name="jgzdmc">
        <Property/>
        <Property name="label">军供站点名称</Property>
      </PropertyDef>
      <PropertyDef name="bzrq">
        <Property name="dataType">Date</Property>
        <Property name="label">编制日期</Property>
      </PropertyDef>
      <PropertyDef name="jhnd">
        <Property/>
        <Property name="label">计划年度</Property>
      </PropertyDef>
      <PropertyDef name="jhjd">
        <Property/>
        <Property name="label">计划季度</Property>
      </PropertyDef>
      <PropertyDef name="lspzbm">
        <Property/>
        <Property name="label">品种编号</Property>
      </PropertyDef>
      <PropertyDef name="ppbh">
        <Property/>
        <Property name="label">品牌编号</Property>
      </PropertyDef>
      <PropertyDef name="cpbh">
        <Property/>
        <Property name="label">产品编号</Property>
      </PropertyDef>
      <PropertyDef name="jhsl">
        <Property name="dataType">Double</Property>
        <Property name="label">计划数量</Property>
      </PropertyDef>
      <PropertyDef name="sxsl1">
        <Property name="dataType">Double</Property>
        <Property name="label">上旬需求数量1</Property>
      </PropertyDef>
      <PropertyDef name="xxsl1">
        <Property name="dataType">Double</Property>
        <Property name="label">下旬需求数量1</Property>
      </PropertyDef>
      <PropertyDef name="sxsl2">
        <Property name="dataType">Double</Property>
        <Property name="label">上旬需求数量2</Property>
      </PropertyDef>
      <PropertyDef name="xxsl2">
        <Property name="dataType">Double</Property>
        <Property name="label">下旬需求数量2</Property>
      </PropertyDef>
      <PropertyDef name="sxsl3">
        <Property name="dataType">Double</Property>
        <Property name="label">上旬需求数量3</Property>
      </PropertyDef>
      <PropertyDef name="xxsl3">
        <Property name="dataType">Double</Property>
        <Property name="label">下旬需求数量3</Property>
      </PropertyDef>
      <PropertyDef name="jldwbm">
        <Property/>
        <Property name="label">计量单位编号</Property>
      </PropertyDef>
      <PropertyDef name="jldwmc">
        <Property/>
        <Property name="label">计量单位名称</Property>
      </PropertyDef>
      <PropertyDef name="lxr">
        <Property/>
        <Property name="label">联系人</Property>
      </PropertyDef>
      <PropertyDef name="lxfs">
        <Property/>
        <Property name="label">联系方式</Property>
      </PropertyDef>
      <PropertyDef name="fgld">
        <Property/>
        <Property name="label">分管领导</Property>
      </PropertyDef>
      <PropertyDef name="fhr">
        <Property/>
        <Property name="label">复核人</Property>
      </PropertyDef>
      <PropertyDef name="tbdw">
        <Property/>
        <Property name="label">填报单位</Property>
      </PropertyDef>
      <PropertyDef name="tbr">
        <Property/>
        <Property name="label">填报人</Property>
      </PropertyDef>
      <PropertyDef name="tbsj">
        <Property name="dataType">DateTime</Property>
        <Property name="label">填报时间</Property>
      </PropertyDef>
      <PropertyDef name="sfyx">
        <Property/>
        <Property name="label">是否有效</Property>
      </PropertyDef>
      <PropertyDef name="bz">
        <Property/>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="bizId">
        <Property/>
        <Property name="label">业务ID</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
      </PropertyDef>
      <PropertyDef name="kqdm">
        <Property/>
        <Property name="label">库区代码</Property>
      </PropertyDef>
    </DataType>
  </Model>
  <View layout="regionPadding:10">
    <Property name="packages">font-awesome,css-common</Property>
    <DataSet id="dsMain">
      <Property name="dataType">[dtMain]</Property>
      <Property name="dataProvider">whjlApi1221PR#listData</Property>
    </DataSet>
    <Container layout="regionPadding:10" layoutConstraint="top">
      <Property name="exClassName">bg-color</Property>
      <Property name="height">55</Property>
      <Property name="contentOverflow">hidden</Property>
      <Label layoutConstraint="left">
        <Property name="text">菜单栏:</Property>
      </Label>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
        <Property name="iconClass">fa fa-plus</Property>
        <Property name="caption">新增</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要修改的数据!&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">编辑</Property>
        <Property name="iconClass">fa fa-pencil</Property>
        <Property name="exClassName">btn-warm</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
if(cur){&#xD;
    view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,cur).execute(function(result){&#xD;
        if(result){&#xD;
            $alert(result);&#xD;
        } else{&#xD;
            cur.remove();&#xD;
        }&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要删除的数据!&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">删除</Property>
        <Property name="iconClass">fa fa-minus</Property>
        <Property name="exClassName">btn-warn</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();</ClientEvent>
        <Property name="caption">刷新</Property>
        <Property name="iconClass">fa fa-search</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
      <Button layoutConstraint="left">
        <ClientEvent name="onClick">var select = view.get(&quot;#dgMain&quot;).get(&quot;selection&quot;);&#xD;
if(select &amp;&amp; select.length > 0){&#xD;
    view.get(&quot;#ajaxPush&quot;).set(&quot;parameter&quot;,select).execute(function(result){&#xD;
        view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
        $notify(result);&#xD;
    });&#xD;
}else{&#xD;
    $alert(&quot;请勾选需要上报的数据!&quot;);&#xD;
}</ClientEvent>
        <Property name="caption">手动上传</Property>
        <Property name="iconClass">fa fa-hand-o-up</Property>
        <Property name="exClassName">btn-default</Property>
      </Button>
      <Button layoutConstraint="right">
        <ClientEvent name="onClick">//显示记录&#xD;
view.get(&quot;#iFrame&quot;).reload();&#xD;
view.get(&quot;#dialogLog&quot;).show();</ClientEvent>
        <Property name="caption">上传记录</Property>
        <Property name="iconClass">fa fa-bars</Property>
        <Property name="exClassName">btn-flush</Property>
      </Button>
    </Container>
    <Container layoutConstraint="center">
      <Property name="exClassName">bg-color</Property>
      <DataGrid id="dgMain">
        <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
}</ClientEvent>
        <Property name="dataSet">dsMain</Property>
        <Property name="selectionMode">multiRows</Property>
        <Property name="readOnly">true</Property>
        <RowNumColumn/>
        <RowSelectorColumn>
          <Property name="caption">上传</Property>
        </RowSelectorColumn>
        <DataColumn name="jhid">
          <Property name="property">jhid</Property>
        </DataColumn>
        <DataColumn name="jhbh">
          <Property name="property">jhbh</Property>
        </DataColumn>
        <DataColumn name="jhmc">
          <Property name="property">jhmc</Property>
        </DataColumn>
        <DataColumn name="jlqybh">
          <Property name="property">jlqybh</Property>
        </DataColumn>
        <DataColumn name="ssqymc">
          <Property name="property">ssqymc</Property>
        </DataColumn>
        <DataColumn name="jgzdbh">
          <Property name="property">jgzdbh</Property>
        </DataColumn>
        <DataColumn name="jgzdmc">
          <Property name="property">jgzdmc</Property>
        </DataColumn>
        <DataColumn name="bzrq">
          <Property name="property">bzrq</Property>
        </DataColumn>
        <DataColumn name="jhnd">
          <Property name="property">jhnd</Property>
        </DataColumn>
        <DataColumn name="jhjd">
          <Property name="property">jhjd</Property>
        </DataColumn>
        <DataColumn name="lspzbm">
          <Property name="property">lspzbm</Property>
        </DataColumn>
        <DataColumn name="ppbh">
          <Property name="property">ppbh</Property>
        </DataColumn>
        <DataColumn name="cpbh">
          <Property name="property">cpbh</Property>
        </DataColumn>
        <DataColumn name="jhsl">
          <Property name="property">jhsl</Property>
        </DataColumn>
        <DataColumn name="sxsl1">
          <Property name="property">sxsl1</Property>
        </DataColumn>
        <DataColumn name="xxsl1">
          <Property name="property">xxsl1</Property>
        </DataColumn>
        <DataColumn name="sxsl2">
          <Property name="property">sxsl2</Property>
        </DataColumn>
        <DataColumn name="xxsl2">
          <Property name="property">xxsl2</Property>
        </DataColumn>
        <DataColumn name="sxsl3">
          <Property name="property">sxsl3</Property>
        </DataColumn>
        <DataColumn name="xxsl3">
          <Property name="property">xxsl3</Property>
        </DataColumn>
        <DataColumn name="jldwbm">
          <Property name="property">jldwbm</Property>
        </DataColumn>
        <DataColumn name="jldwmc">
          <Property name="property">jldwmc</Property>
        </DataColumn>
        <DataColumn name="lxr">
          <Property name="property">lxr</Property>
        </DataColumn>
        <DataColumn name="lxfs">
          <Property name="property">lxfs</Property>
        </DataColumn>
        <DataColumn name="fgld">
          <Property name="property">fgld</Property>
        </DataColumn>
        <DataColumn name="fhr">
          <Property name="property">fhr</Property>
        </DataColumn>
        <DataColumn name="tbdw">
          <Property name="property">tbdw</Property>
        </DataColumn>
        <DataColumn name="tbr">
          <Property name="property">tbr</Property>
        </DataColumn>
        <DataColumn name="tbsj">
          <Property name="property">tbsj</Property>
        </DataColumn>
        <DataColumn name="sfyx">
          <Property name="property">sfyx</Property>
        </DataColumn>
        <DataColumn name="bz">
          <Property name="property">bz</Property>
        </DataColumn>
        <DataColumn name="bizId">
          <Property name="property">bizId</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
        </DataColumn>
        <DataColumn name="czbz">
          <Property name="property">czbz</Property>
        </DataColumn>
        <DataColumn name="kqdm">
          <Property name="property">kqdm</Property>
        </DataColumn>
      </DataGrid>
    </Container>
    <Dialog id="dialogMain">
      <Property name="width">85%</Property>
      <Property name="closeable">false</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Property name="caption">物资库存预警记录</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
view.get(&quot;#updateSave&quot;).execute(function(){&#xD;
    self.get(&quot;parent&quot;).hide();&#xD;
    view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
});</ClientEvent>
          <Property name="caption">确定</Property>
          <Property name="iconClass">fa fa-check</Property>
        </Button>
        <Button>
          <ClientEvent name="onClick">var cur = view.get(&quot;#dgMain&quot;).getCurrentItem();&#xD;
self.get(&quot;parent&quot;).hide();&#xD;
if(cur) cur.cancel();</ClientEvent>
          <Property name="caption">取消</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*,*,*</Property>
          <Property name="labelPosition">top</Property>
          <Property name="labelSeparator">:</Property>
          <Property name="labelAlign">left</Property>
          <AutoFormElement>
            <Property name="name">jhid</Property>
            <Property name="property">jhid</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhbh</Property>
            <Property name="property">jhbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhmc</Property>
            <Property name="property">jhmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jlqybh</Property>
            <Property name="property">jlqybh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ssqymc</Property>
            <Property name="property">ssqymc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdbh</Property>
            <Property name="property">jgzdbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jgzdmc</Property>
            <Property name="property">jgzdmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bzrq</Property>
            <Property name="property">bzrq</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhnd</Property>
            <Property name="property">jhnd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhjd</Property>
            <Property name="property">jhjd</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lspzbm</Property>
            <Property name="property">lspzbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">ppbh</Property>
            <Property name="property">ppbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">cpbh</Property>
            <Property name="property">cpbh</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jhsl</Property>
            <Property name="property">jhsl</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sxsl1</Property>
            <Property name="property">sxsl1</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xxsl1</Property>
            <Property name="property">xxsl1</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sxsl2</Property>
            <Property name="property">sxsl2</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xxsl2</Property>
            <Property name="property">xxsl2</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sxsl3</Property>
            <Property name="property">sxsl3</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">xxsl3</Property>
            <Property name="property">xxsl3</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jldwbm</Property>
            <Property name="property">jldwbm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">jldwmc</Property>
            <Property name="property">jldwmc</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lxr</Property>
            <Property name="property">lxr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">lxfs</Property>
            <Property name="property">lxfs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fgld</Property>
            <Property name="property">fgld</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">fhr</Property>
            <Property name="property">fhr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tbdw</Property>
            <Property name="property">tbdw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tbr</Property>
            <Property name="property">tbr</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">tbsj</Property>
            <Property name="property">tbsj</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">sfyx</Property>
            <Property name="property">sfyx</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bz</Property>
            <Property name="property">bz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bizId</Property>
            <Property name="property">bizId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">kqdm</Property>
            <Property name="property">kqdm</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="updateSave">
      <Property name="dataResolver">whjlApi1221PR#saveData</Property>
      <UpdateItem>
        <Property name="dataPath">[#current]</Property>
        <Property name="dataSet">dsMain</Property>
      </UpdateItem>
    </UpdateAction>
    <AjaxAction id="ajaxDel">
      <Property name="confirmMessage">当前数据删除后无法恢复,请确认要删除么?</Property>
      <Property name="service">whjlApi1221PR#delData</Property>
    </AjaxAction>
    <AjaxAction id="ajaxPush">
      <Property name="service">whjlApi1221PR#pushData</Property>
    </AjaxAction>
    <Dialog id="dialogLog">
      <Property name="width">90%</Property>
      <Property name="height">90%</Property>
      <Property name="caption">上传记录</Property>
      <Property name="iconClass">fa fa-sliders</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">self.get(&quot;parent&quot;).hide();</ClientEvent>
          <Property name="caption">关闭</Property>
          <Property name="iconClass">fa fa-times</Property>
        </Button>
      </Buttons>
      <Children>
        <Container>
          <IFrame id="iFrame">
            <Property name="path">com.fzzy.api.view.ApiLog.d</Property>
            <Property name="userData">
              <Entity>
                <Property name="deptId">deptId</Property>
              </Entity>
            </Property>
          </IFrame>
        </Container>
      </Children>
      <Tools/>
    </Dialog>
    <ListDropDown id="listDropYN">
      <Property name="items">是,否</Property>
    </ListDropDown>
    <ListDropDown id="listDropType">
      <Property name="items">日常出库,日常入库,应急出库,应急入库</Property>
    </ListDropDown>
    <ListDropDown id="listDropInOut">
      <Property name="items">入库,出库</Property>
    </ListDropDown>
  </View>
</ViewConfig>
src/main/java/com/fzzy/otherview/whhpjl/WhjlApi1405.view.xml
@@ -58,19 +58,22 @@
      </PropertyDef>
      <PropertyDef name="htqdr">
        <Property></Property>
        <Property name="label">合同签订时间</Property>
        <Property name="label">合同签订人</Property>
      </PropertyDef>
      <PropertyDef name="htqdsj">
        <Property></Property>
        <Property name="label">合同签订时间</Property>
        <Property name="dataType">DateTime</Property>
      </PropertyDef>
      <PropertyDef name="htsxsj">
        <Property></Property>
        <Property name="label">合同生效日期</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="htjzsj">
        <Property></Property>
        <Property name="label">合同截止日期</Property>
        <Property name="dataType">Date</Property>
      </PropertyDef>
      <PropertyDef name="htcjr">
        <Property></Property>
@@ -79,6 +82,7 @@
      <PropertyDef name="htcjsj">
        <Property></Property>
        <Property name="label">合同创建时间</Property>
        <Property name="dataType">DateTime</Property>
      </PropertyDef>
      <PropertyDef name="htdbgjlbz">
        <Property></Property>
src/main/java/com/fzzy/otherview/whhpjl/WhjlConstant.java
@@ -168,6 +168,10 @@
     */
    public static String API_CODE_1220 = "1220";
    /**
     * æŽ¥å£ç¼–码-1220 ç­¹æŽªè®¡åˆ’
     */
    public static String API_CODE_1221 = "1221";
    /**
     * æŽ¥å£ç¼–码-1301 æ¸©æ¹¿åº¦æ£€æµ‹è®°å½•数据接口
     */
    public static String API_CODE_1301 = "1301";
@@ -330,6 +334,8 @@
    public static String API_CODE_WZKCYJGZ = "WZKCYJGZ";
    //接口编码-1220 ç‰©èµ„库存预警规则--路径(WZKCYJJL)
    public static String API_CODE_WZKCYJJL = "WZKCYJJL";
    //接口编码-1221 ç­¹æŽªè®¡åˆ’--路径(CCJH)
    public static String API_CODE_CCJH = "CCJH";
    //接口编码-1301 æ¸©æ¹¿åº¦æ£€æµ‹è®°å½• --路径(WSDJCJL)
    public static String API_CODE_WSDJCJL = "WSDJCJL";
    //接口编码-1302 è¿è¾“环境检测记录 --路径(YSHJJCJL)
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1109.java
@@ -30,7 +30,7 @@
    private String sscfmc;  //仓房名称
    private String dalx;  //档案类型
    private String damc;  //档案名称
    private byte[] dawj;  //档案文件
    private byte dawj;  //档案文件
    private String sfyx;  //是否有效
    private String bz;  //备注
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1114.java
@@ -41,6 +41,7 @@
    private String wxff;  //维修方法
    private String gxpjxx;  //更新配件信息
    private String wxhyxzt;  //维修后运行状态
    private String ysynx;  //已使用年限
    private int sysj;  //试用时间
    private String wxfy;  //维修费用
    private String ysr;  //验收人
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1206.java
@@ -35,7 +35,7 @@
    private String jljgqymc; //加工企业名称
    private String htkhbh; //合同客户编号
    private String htkhmc; //合同客户名称
    private String htspdj; //合同商品单价
    private Double htspdj; //合同商品单价
    private Double htspsl; //合同商品数量
    private String spbm; //商品编码
    private Double zje; //总金额
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1221.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,66 @@
package com.fzzy.otherview.whhpjl.dto;
import com.alibaba.fastjson.annotation.JSONField;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.io.Serializable;
import java.util.Date;
/**
 * ç­¹æŽªè®¡åˆ’
 *
 */
@Data
@EqualsAndHashCode(callSuper = false)
public class WhjlApi1221 implements Serializable {
    /**
     *
     */
    private static final long serialVersionUID = 1L;
    private String jhid; //计划ID
    private String jhbh; //计划编号
    private String jhmc; //计划名称
    private String jlqybh; //军粮企业编号
    private String ssqymc; //军粮企业名称
    private String jgzdbh; //军供站点编号
    private String jgzdmc; //军供站点名称
    @JSONField(format = "yyyy-MM-dd")
    private Date bzrq; //编制日期
    private String jhnd; //计划年度
    private String jhjd; //计划季度
    private String lspzbm; //品种编号
    private String ppbh; //品牌编号
    private String cpbh; //产品编号
    private Double jhsl; //计划数量
    private Double sxsl1; //上旬需求数量1
    private Double xxsl1; //下旬需求数量1
    private Double sxsl2; //上旬需求数量2
    private Double xxsl2; //下旬需求数量2
    private Double sxsl3; //上旬需求数量3
    private Double xxsl3; //下旬需求数量3
    private String jldwbm; //计量单位编号
    private String jldwmc; //计量单位名称
    private String lxr; //联系人
    private String lxfs; //联系方式
    private String fgld; //分管领导
    private String fhr; //复核人
    private String tbdw; //填报单位
    private String tbr; //填报人
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date tbsj; //填报时间
    private String sfyx; //是否有效
    private String bz; //备注
    //单独增加,不进行上传
    @JSONField(serialize = false)
    private String bizId;  //业务ID
    @JSONField(serialize = false)
    private Date updateTime;  //最后更新时间
    private String czbz;  //操作标志
    @JSONField(serialize = false)
    private String kqdm;  //库区代码
}
src/main/java/com/fzzy/otherview/whhpjl/dto/WhjlApi1405.java
@@ -33,15 +33,15 @@
    private Double htspdj; //合同商品单价
    private Double zje; //总金额
    private String htqdr; //合同签订人
    @JSONField(format = "YYYY-MM-dd HH:mm:ss")
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date htqdsj; //合同签订时间
    @JSONField(format = "YYYYMMDD")
    private String htsxsj; //合同生效日期
    @JSONField(format = "YYYYMMDD")
    private String htjzsj; //合同截止日期
    @JSONField(format = "yyyyMMdd")
    private Date htsxsj; //合同生效日期
    @JSONField(format = "yyyyMMdd")
    private Date htjzsj; //合同截止日期
    private String htcjr; //合同创建人
    @JSONField(format = "YYYY-MM-dd HH:mm:ss")
    private String htcjsj; //合同创建时间
    @JSONField(format = "yyyy-MM-dd HH:mm:ss")
    private Date htcjsj; //合同创建时间
    private String htdbgjlbz; //合同的变更记录标志
    private String htbgyy; //合同变更原因
    private String htlx; //合同类型
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1101PR.java
@@ -130,7 +130,7 @@
        ResponseDto responseDto;
        ApiInfoData infoData;
        for (WhjlApi1101 data : items) {
            responseDto = apiService.pushData(param, apiConf, items);
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1106PR.java
@@ -130,7 +130,7 @@
        ResponseDto responseDto;
        ApiInfoData infoData;
        for (WhjlApi1106 data : items) {
            responseDto = apiService.pushData(param, apiConf, items);
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1109PR.java
@@ -15,6 +15,7 @@
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.utils.ContextUtil;
import com.fzzy.api.utils.FileUtils;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1109;
@@ -120,7 +121,7 @@
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_12);
        infoData.setInteType(WhjlConstant.API_CATEGORY_11);
        infoData.setInteId(WhjlConstant.API_CODE_1109);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
@@ -164,7 +165,7 @@
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1109);
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_11, WhjlConstant.API_CODE_1109);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
@@ -175,13 +176,15 @@
        ResponseDto responseDto;
        ApiInfoData infoData;
        for (WhjlApi1109 data : items) {
//            byte[] bytes = FileUtils.file2byte(data.getBz());
//            data.setDawj(bytes);
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                    infoData.setInteType(WhjlConstant.API_CATEGORY_11);
                    infoData.setInteId(WhjlConstant.API_CODE_1109);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());
src/main/java/com/fzzy/otherview/whhpjl/pr/WhjlApi1221PR.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,157 @@
package com.fzzy.otherview.whhpjl.pr;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.Constant;
import com.fzzy.api.data.ApiParam;
import com.fzzy.api.dto.ResponseDto;
import com.fzzy.api.entity.ApiConfs;
import com.fzzy.api.entity.ApiInfoData;
import com.fzzy.api.service.ApiCommonService;
import com.fzzy.api.service.ApiPushManager;
import com.fzzy.api.service.ApiRemoteService;
import com.fzzy.api.view.repository.ApiInfoDataRep;
import com.fzzy.otherview.whhpjl.WhjlConstant;
import com.fzzy.otherview.whhpjl.dto.WhjlApi1221;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
/**
 * ç‰©èµ„库存预警记录
 *
 * @Author:YAN
 */
@Component
public class WhjlApi1221PR {
    @Autowired
    private ApiCommonService apiCommonService;
    @Autowired
    private ApiPushManager apiPushManager;
    @Autowired
    private ApiInfoDataRep apiInfoDataRep;
    /**
     * èŽ·å–åˆ—è¡¨ä¿¡æ¯
     * whjlApi1221PR#listData
     *
     * @return
     */
    @DataProvider
    public List<WhjlApi1221> listData() {
        List<ApiInfoData> result = apiInfoDataRep.getDataByInteId(WhjlConstant.API_CODE_1221);
        if (null == result || result.isEmpty()) {
            return null;
        }
        List<WhjlApi1221> list = new ArrayList<>();
        WhjlApi1221 whjlApi1221;
        for (ApiInfoData infoData : result) {
            whjlApi1221 = JSONObject.parseObject(infoData.getData(), WhjlApi1221.class);
            whjlApi1221.setKqdm(infoData.getKqdm());
            whjlApi1221.setCzbz(infoData.getCzbz());
            whjlApi1221.setUpdateTime(infoData.getUpdateTime());
            whjlApi1221.setBizId(infoData.getDataId());
            list.add(whjlApi1221);
        }
        return list;
    }
    /**
     * æ›´æ–°æˆ–修改
     * whjlApi1221PR#saveData
     *
     * @param data
     * @return
     */
    @DataResolver
    public void saveData(WhjlApi1221 data) {
        ApiInfoData infoData = new ApiInfoData();
        infoData.setId(data.getBizId());
        infoData.setKqdm(data.getKqdm());
        infoData.setInteType(WhjlConstant.API_CATEGORY_12);
        infoData.setInteId(WhjlConstant.API_CODE_1221);
        infoData.setUpdateTime(new Date());
        infoData.setDataId(data.getBizId());
        infoData.setData(JSON.toJSONString(data));
        infoData.setCzbz(data.getCzbz());
        infoData.setRemarks("备注信息");
        apiInfoDataRep.save(infoData);
    }
    /**
     * åˆ é™¤
     * whjlApi1221PR#delData
     *
     * @param data
     * @return
     */
    @Expose
    public String delData(WhjlApi1221 data) {
        apiInfoDataRep.deleteById(data.getBizId());
        return null;
    }
    /**
     * ä¸Šä¼ 
     * whjlApi1221PR#pushData
     *
     * @param items
     * @return
     */
    @Expose
    public String pushData(List<WhjlApi1221> items) {
        String result = "";
        String kqdm = items.get(0).getKqdm();
        ApiConfs apiConf = apiCommonService.getConf(kqdm);
        if (null == apiConf) {
            return "系统没有获取到当前库区配置信息,执行失败";
        }
        //封装参数
        ApiParam param = new ApiParam(apiConf, WhjlConstant.API_CATEGORY_12, WhjlConstant.API_CODE_1221);
        //获取实现接口
        ApiRemoteService apiService = apiPushManager.getApiRemoteService(param.getPushProtocol());
        if (null == apiService) {
            return "系统没有当前推送协议配置,执行失败";
        }
        ApiInfoData infoData;
        ResponseDto responseDto;
        for (WhjlApi1221 data : items) {
            responseDto = apiService.pushData(param, apiConf, data);
            if (responseDto.getSuccess() == 0) {
                if (Constant.CZBZ_I.equals(data.getCzbz())) {
                    infoData = new ApiInfoData();
                    infoData.setId(data.getBizId());
                    infoData.setKqdm(data.getKqdm());
                    infoData.setInteType(WhjlConstant.API_CATEGORY_12);
                    infoData.setInteId(WhjlConstant.API_CODE_1221);
                    infoData.setUpdateTime(new Date());
                    infoData.setDataId(data.getBizId());
                    data.setCzbz(Constant.CZBZ_U);
                    infoData.setCzbz(Constant.CZBZ_U);
                    infoData.setData(JSON.toJSONString(data));
                    apiInfoDataRep.save(infoData);
                }
            }
            result += responseDto.toString();
        }
        return result;
    }
}
src/main/java/com/fzzy/push/whhpjl/WhjlApiRemoteService.java
@@ -231,6 +231,8 @@
                return WhjlConstant.API_CODE_WZKCYJGZ;
            case "1220":
                return WhjlConstant.API_CODE_WZKCYJJL;
            case "1221":
                return WhjlConstant.API_CODE_CCJH;
            case "1301":
                return WhjlConstant.API_CODE_WSDJCJL;
            case "1302":
src/main/resources/templates/home/home-whjl.html
@@ -225,6 +225,9 @@
                            <dd>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1220.d">物资库存预警记录</a>
                            </dd>
                            <dd>
                                <a lay-href="com.fzzy.otherview.whhpjl.WhjlApi1221.d">筹措计划</a>
                            </dd>
                        </dl>
                    </li>