优化通知单绑定计划详细

CZT

2023-11-04 588f83a71381a79d3c391f5df0b8e266f397264f

优化通知单绑定计划详细

 igds-inout/src/main/java/com/ld/igds/m/service/HPlanManageService.java

@@ -190,4 +190,26 @@

        return this.query(hql, args);
    }

    public void pagePlanDetail(Page<InoutPlanDetail> page, Map<String, Object> param)
            throws Exception {
        String hql = " from " + InoutPlanDetail.class.getName()
                + " where 1=1 ";

        Map<String, Object> args = new HashMap<String, Object>();

        if (null != param) {
            String str = (String) param.get("key");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and year like :year ";
                args.put("year", "%" + str + "%");
            }
        }

        String count = "select count(*) " + hql;

        hql += " order by updateTime desc";

        this.pagingQuery(page, hql, count, args);
    }
}

 igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeIn.view.xml

@@ -16,17 +16,17 @@
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
        <Property name="required">false</Property>
      </PropertyDef>
      <PropertyDef name="planId">
        <Property></Property>
        <Property name="label">所属计划</Property>
        <Property name="required">false</Property>
        <Property name="mapping">
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#listPlan&quot;).getResult()}</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="planName">
        <Property></Property>
@@ -65,6 +65,15 @@
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">name</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">装卸仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
@@ -176,65 +185,69 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划明细号</Property>
      </PropertyDef>
      <PropertyDef name="planId">
        <Property name="label">计划编码</Property>
      </PropertyDef>
      <PropertyDef name="referenceNumber">
        <Property name="label">计划文号</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
      <PropertyDef name="foodVariety">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="label">粮食品种</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
        <Property name="label">计划类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#triggerPlanType&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="name">
      <PropertyDef name="foodType">
        <Property></Property>
        <Property name="label">计划名称</Property>
        <Property name="required">true</Property>
        <Property name="label">粮食性质</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="foodLevel">
        <Property></Property>
        <Property name="label">粮食等级</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="year">
        <Property></Property>
        <Property name="label">年份</Property>
        <Property name="required">true</Property>
        <Property name="label">收获年度</Property>
      </PropertyDef>
      <PropertyDef name="beginTime">
        <Property name="dataType">Date</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="endTime">
        <Property name="dataType">Date</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">创建人</Property>
        <Property name="label">仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">Date</Property>
        <Property name="label">创建时间</Property>
      <PropertyDef name="planNum">
        <Property name="dataType">Double</Property>
        <Property name="label">计划数量</Property>
      </PropertyDef>
      <PropertyDef name="remark">
      <PropertyDef name="type">
        <Property name="label">计划类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#triggerPlanTurn&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property></Property>
        <Property name="label">备注说明</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtContract">
@@ -586,6 +599,11 @@
          <Property name="name">customerName</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="depotId">
          <Property name="property">depotId</Property>
          <Property name="align">center</Property>
          <Property name="width">150</Property>
        </DataColumn>
        <DataColumn name="foodVariety">
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
@@ -720,8 +738,8 @@
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">planId</Property>
                <Property name="property">planId</Property>
                <Property name="name">planName</Property>
                <Property name="property">planName</Property>
                <Property name="trigger">ddPlan</Property>
                <Editor/>
              </AutoFormElement>
@@ -756,6 +774,11 @@
              <AutoFormElement>
                <Property name="name">completeStatus</Property>
                <Property name="property">completeStatus</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">depotId</Property>
                <Property name="property">depotId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement layoutConstraint="colSpan:2">
@@ -874,19 +897,19 @@
    </AjaxAction>
    <CustomDropDown id="ddPlan">
      <Property name="minHeight">317</Property>
      <Property name="assignmentMap">planId=id,planName=name</Property>
      <Property name="assignmentMap">planId=id,planName=planId</Property>
      <Property name="minWidth">550</Property>
      <Property name="autoOpen">false</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsPlan">
          <Property name="dataProvider">planManagePR#pagePlan</Property>
          <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
          <Property name="dataType">[dtPlan]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">5</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 计划名称或者计划文号 --</Property>
            <Property name="blankText"> -- 年份 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
@@ -912,33 +935,35 @@
          <Property name="dataSet">dsPlan</Property>
          <Property name="readOnly">true</Property>
          <DataColumn>
            <Property name="property">id</Property>
            <Property name="property">planId</Property>
            <Property name="width">100</Property>
            <Property name="align">center</Property>
            <Property name="name">id</Property>
            <Property name="name">planId</Property>
            <Property name="visible">false</Property>
          </DataColumn>
          <DataColumn name="name">
          <DataColumn name="depotId">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
            <Property name="property">name</Property>
            <Property name="property">depotId</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">referenceNumber</Property>
            <Property name="width">200</Property>
            <Property name="align">center</Property>
            <Property name="name">referenceNumber</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">year</Property>
            <Property name="width">80</Property>
            <Property name="align">center</Property>
            <Property name="name">year</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">planNum</Property>
            <Property name="align">center</Property>
            <Property name="name">planNum</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">foodVariety</Property>
            <Property name="align">center</Property>
            <Property name="name">foodVariety</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">type</Property>
            <Property name="width">80</Property>
            <Property name="align">center</Property>
            <Property name="name">type</Property>
          </DataColumn>

 igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticeOut.view.xml

@@ -18,7 +18,7 @@
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">库区编码</Property>
        <Property name="label">所属分库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
@@ -214,65 +214,69 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划明细号</Property>
      </PropertyDef>
      <PropertyDef name="planId">
        <Property name="label">计划编码</Property>
      </PropertyDef>
      <PropertyDef name="referenceNumber">
        <Property name="label">计划文号</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
      <PropertyDef name="foodVariety">
        <Property></Property>
        <Property name="label">组织编码</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
        <Property name="label">所属分库</Property>
        <Property name="label">粮食品种</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#loadParents&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
        <Property name="label">计划类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#triggerPlanType&quot;).getResult()}</Property>
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="name">
      <PropertyDef name="foodType">
        <Property></Property>
        <Property name="label">计划名称</Property>
        <Property name="required">true</Property>
        <Property name="label">粮食性质</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="foodLevel">
        <Property></Property>
        <Property name="label">粮食等级</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="year">
        <Property></Property>
        <Property name="label">年份</Property>
        <Property name="required">true</Property>
        <Property name="label">收获年度</Property>
      </PropertyDef>
      <PropertyDef name="beginTime">
        <Property name="dataType">Date</Property>
        <Property name="label">开始时间</Property>
      </PropertyDef>
      <PropertyDef name="endTime">
        <Property name="dataType">Date</Property>
        <Property name="label">截止时间</Property>
      </PropertyDef>
      <PropertyDef name="createUser">
      <PropertyDef name="depotId">
        <Property></Property>
        <Property name="label">创建人</Property>
        <Property name="label">仓库</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
          <Property name="keyProperty">id</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="createTime">
        <Property name="dataType">Date</Property>
        <Property name="label">创建时间</Property>
      <PropertyDef name="planNum">
        <Property name="dataType">Double</Property>
        <Property name="label">计划数量</Property>
      </PropertyDef>
      <PropertyDef name="remark">
      <PropertyDef name="type">
        <Property name="label">计划类型</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;planManagePR#triggerPlanTurn&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property></Property>
        <Property name="label">备注说明</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtContract">
@@ -938,19 +942,19 @@
    </AjaxAction>
    <CustomDropDown id="ddPlan">
      <Property name="minHeight">317</Property>
      <Property name="assignmentMap">planId=id,planName=name</Property>
      <Property name="assignmentMap">planId=id,planName=planId</Property>
      <Property name="minWidth">550</Property>
      <Property name="autoOpen">false</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsPlan">
          <Property name="dataProvider">planManagePR#pagePlan</Property>
          <Property name="dataProvider">planManagePR#pagePlanDetail</Property>
          <Property name="dataType">[dtPlan]</Property>
          <Property name="parameter"></Property>
          <Property name="pageSize">5</Property>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key2">
            <Property name="blankText"> -- 计划名称或者计划文号 --</Property>
            <Property name="blankText">  -- 年份 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
@@ -976,34 +980,39 @@
          <Property name="dataSet">dsPlan</Property>
          <Property name="readOnly">true</Property>
          <DataColumn>
            <Property name="property">id</Property>
            <Property name="property">planId</Property>
            <Property name="width">100</Property>
            <Property name="align">center</Property>
            <Property name="name">id</Property>
            <Property name="name">planId</Property>
            <Property name="visible">false</Property>
          </DataColumn>
          <DataColumn name="name">
          <DataColumn name="depotId">
            <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
arg.processDefault = true;</ClientEvent>
            <Property name="property">name</Property>
            <Property name="property">depotId</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">referenceNumber</Property>
            <Property name="width">200</Property>
            <Property name="align">center</Property>
            <Property name="name">referenceNumber</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">year</Property>
            <Property name="width">80</Property>
            <Property name="width">200</Property>
            <Property name="align">center</Property>
            <Property name="name">year</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">type</Property>
            <Property name="property">planNum</Property>
            <Property name="width">80</Property>
            <Property name="align">center</Property>
            <Property name="name">planNum</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">foodVariety</Property>
            <Property name="width">80</Property>
            <Property name="align">center</Property>
            <Property name="name">foodVariety</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">type</Property>
            <Property name="align">center</Property>
            <Property name="name">type</Property>
          </DataColumn>
        </DataGrid>

 igds-inout/src/main/java/com/ld/igds/m/view/PlanManage.view.xml

@@ -114,6 +114,7 @@
      <PropertyDef name="year">
        <Property></Property>
        <Property name="label">年份</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="type">
        <Property></Property>
@@ -137,6 +138,7 @@
      <PropertyDef name="foodType">
        <Property></Property>
        <Property name="label">粮食性质</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
@@ -146,6 +148,7 @@
      <PropertyDef name="foodLevel">
        <Property></Property>
        <Property name="label">粮食等级</Property>
        <Property name="required">true</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
          <Property name="keyProperty">code</Property>
@@ -156,6 +159,7 @@
        <Property name="dataType">Double</Property>
        <Property name="label">数量</Property>
        <Property name="displayFormat">#.0  KG</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
@@ -573,6 +577,12 @@
                    <Property name="name">foodLevel</Property>
                  </DataColumn>
                  <DataColumn>
                    <Property name="property">year</Property>
                    <Property name="align">center</Property>
                    <Property name="name">year</Property>
                    <Property name="trigger">yearDropDown1</Property>
                  </DataColumn>
                  <DataColumn>
                    <Property name="property">type</Property>
                    <Property name="align">center</Property>
                    <Property name="name">type</Property>

 igds-inout/src/main/java/com/ld/igds/m/view/PlanManagePR.java

@@ -157,6 +157,23 @@
        return service.listPlanDetail(planId);
    }


    /**
     * 获取计划列表
     * planManagePR#pagePlanDetail
     *
     * @param page
     * @param param
     * @throws Exception
     */
    @DataProvider
    public void pagePlanDetail(Page<InoutPlanDetail> page, Map<String, Object> param) throws Exception {
        if (null == param) {
            param = new HashMap<String, Object>();
        }
        service.pagePlanDetail(page, param);
    }

    /**
     * 保存计划
     * planManagePR#savePlan

 igds-inout/src/main/java/com/ld/igds/models/InoutNoticeIn.java

@@ -42,6 +42,10 @@
    @PropertyDef(label = "计划明细号", description = "针对轮换粮食必填")
    private String planId;

    @Column(name = "PLAN_NAME_", length = 40)
    @PropertyDef(label = "计划编码", description = "针对轮换粮食必填")
    private String planName;

    @Column(name = "CONTRACT_ID_", length = 40)
    @PropertyDef(label = "合同编码", description = "针对轮换粮食必填")
    private String contractId;

 igds-inout/src/main/java/com/ld/igds/models/InoutNoticeOut.java

@@ -53,9 +53,9 @@
    @PropertyDef(label = "合同名称", description = "针对轮换粮食必填")
    private String contractName;

//    @Column(name = "PLAN_NAME_", length = 50)
//    @PropertyDef(label = "计划名称")
//    private String planName;
    @Column(name = "PLAN_NAME_", length = 50)
    @PropertyDef(label = "计划名称")
    private String planName;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "目标仓库")

 igds-manager/src/main/java/com/ld/igds/oa/service/HStaffService.java

@@ -25,10 +25,11 @@

    public void pageData(Page<OAStaff> page, Map<String, Object> param)
            throws Exception {
        String hql = " from " + OAStaff.class.getName() + " where companyId=:companyId";
        String hql = " from " + OAStaff.class.getName() + " where companyId =:companyId and deptId =:deptId";

        Map<String, Object> args = new HashMap<>();
        args.put("companyId", ContextUtil.getCompanyId());
        args.put("deptId", ContextUtil.subDeptId(null));

        if (null != param) {