~admin/igds-v4.git

YYC

2023-07-25 21bf8b454eee7e80d9471e4424e7520c4f82f3a7

通知单及合同相关优化

已修改6个文件

	igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/service/HInoutNoticeService.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/ContractManage.view.xml	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/com/ld/igds/m/view/InoutCustomerPR.java	19 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	igds-inout/src/main/java/models/inout.model.xml	20 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

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

@@ -862,7 +862,7 @@
    <CustomDropDown id="ddNotice">
      <Property name="minHeight">400</Property>
      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
      <Property name="minWidth">500</Property>
      <Property name="minWidth">1000</Property>
      <Property name="autoOpen">true</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsNotice">
@@ -902,13 +902,34 @@
}</ClientEvent>
          <Property name="dataSet">dsNotice</Property>
          <Property name="readOnly">true</Property>
          <DataColumn name="name">
            <Property name="property">name</Property>
            <Property name="align">center</Property>
            <Property name="width">100</Property>
          </DataColumn>
          <DataColumn>
            <Property name="property">customerName</Property>
            <Property name="align">center</Property>
            <Property name="name">customerName</Property>
            <Property name="width">240</Property>
          </DataColumn>
          <DataColumn name="name">
            <Property name="property">name</Property>
          <DataColumn name="foodVariety">
            <Property name="property">foodVariety</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="year">
            <Property name="property">year</Property>
            <Property name="align">center</Property>
          </DataColumn>
          <DataColumn name="depotId">
            <Property name="property">depotId</Property>
            <Property name="align">center</Property>
            <Property name="width">180</Property>
          </DataColumn>
          <DataColumn name="contractName">
            <Property name="property">contractName</Property>
            <Property name="align">center</Property>
            <Property name="width">300</Property>
          </DataColumn>
        </DataGrid>
      </Container>

 igds-inout/src/main/java/com/ld/igds/m/dto/NoticeDto.java

@@ -1,6 +1,7 @@
package com.ld.igds.m.dto;

import lombok.Data;

import java.util.Date;

/**
@@ -82,4 +83,9 @@
     */
    private Date completeTime;

    /**
     * 所属合同
     */
    private String contractName;

}

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

@@ -15,6 +15,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;

import java.util.*;

@Repository
@@ -257,6 +258,7 @@

    /**
     * 根据参数查询出入库通知单
     *
     * @param parameter
     * @return
     */
@@ -274,12 +276,12 @@
        }else {
            hql += InoutNoticeOut.class.getName();
        }
        hql += " where companyId =:companyId and deptId =:deptId";
        hql += " where companyId =:companyId and deptId =:deptId and completeStatus =:completeStatus";

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

        args.put("completeStatus", "NONE");
        String str = (String) parameter.get("customerId");
        if (StringUtils.isNotEmpty(str)) {
            hql += " and customerId =:customerId";
@@ -325,6 +327,7 @@

    /**
     * 根据id获取通知单信息
     *
     * @param id
     * @param type
     * @return

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

@@ -39,6 +39,9 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtMain">
      <ClientEvent name="onDataChange">if(arg.property ==&quot;customerId&quot;){&#xD;
    autoByCustomer(arg.newValue);&#xD;
}</ClientEvent>
      <Property name="creationType">com.ld.igds.models.InoutContract</Property>
      <PropertyDef name="id">
        <Property></Property>
@@ -371,7 +374,18 @@
  </Model>
  <View layout="regionPadding:10">
    <ClientEvent name="onReady">var deptId = window.parent.deptId;//父页面中的分库编码&#xD;
&#xD;
//根据客户自动回填客户类型，客户开户行，客户开户行账号，客户签约人&#xD;
autoByCustomer = function(id){&#xD;
   view.get(&quot;#ajaxGetCustomer&quot;).set(&quot;parameter&quot;,id).execute(function(result){&#xD;
     if(result){&#xD;
     var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
     data.set(&quot;customerType&quot;,result.khlx);&#xD;
     data.set(&quot;customerBank&quot;,result.bank);&#xD;
     data.set(&quot;customerBankAccount&quot;,result.bankNum);&#xD;
     data.set(&quot;customerSignUser&quot;,result.fddbr);&#xD;
    }&#xD;
});&#xD;
};&#xD;
addMain = function(){&#xD;
    view.get(&quot;#dsMain&quot;).insert({});&#xD;
    view.get(&quot;#dialogMain&quot;).show();&#xD;
@@ -760,6 +774,9 @@
      <Property name="confirmMessage">确定要删除吗？</Property>
      <Property name="service">contractManagePR#delContract</Property>
    </AjaxAction>
    <AjaxAction id="ajaxGetCustomer">
      <Property name="service">inoutCustomerPR#queryListByParam</Property>
    </AjaxAction>
    <CustomDropDown id="ddCustomer">
      <Property name="minHeight">400</Property>
      <Property name="assignmentMap">customerId=id,customerName=name</Property>

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

@@ -2,6 +2,7 @@

import java.text.Collator;
import java.util.*;

import com.ld.igds.m.service.HInoutCustomerService;
import com.ld.igds.models.InoutCustomer;
import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +17,6 @@
 * @description:
 * @version:
 * @data:2020年3月12日
 *
 */
@Component("inoutCustomerPR")
public class InoutCustomerPR {
@@ -78,4 +78,21 @@
    public String delData(InoutCustomer data) {
        return customerService.delData(data);
    }


    /**
     * inoutCustomerPR#queryListByParam
     * 根据关键字查询，ID
     *
     * @param
     * @return
     */
    @Expose
    public InoutCustomer queryListByParam(String id) {
        Map<String, Object> param = new HashMap<>();
        param.put("id", id);
        List<InoutCustomer> list = customerService.queryList(param);

        return list.get(0);
    }
}

 igds-inout/src/main/java/models/inout.model.xml

@@ -554,6 +554,12 @@
    </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>
    <PropertyDef name="customerId">
      <Property></Property>
@@ -564,12 +570,19 @@
    </PropertyDef>
    <PropertyDef name="foodVariety">
      <Property></Property>
      <Property name="mapping">
        <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>
      <Property name="label">粮食品种</Property>
    </PropertyDef>
    <PropertyDef name="foodType">
      <Property></Property>
    </PropertyDef>
    <PropertyDef name="year">
      <Property></Property>
      <Property name="label">年份</Property>
    </PropertyDef>
    <PropertyDef name="targetNumber">
      <Property name="dataType">double</Property>
@@ -580,5 +593,12 @@
    <PropertyDef name="completeTime">
      <Property name="dataType">Date</Property>
    </PropertyDef>
    <PropertyDef name="unitName">
      <Property/>
    </PropertyDef>
    <PropertyDef name="contractName">
      <Property/>
      <Property name="label">所属合同</Property>
    </PropertyDef>
  </DataType>
</Model>

			@@ -862,7 +862,7 @@
			<CustomDropDown id="ddNotice">
			<Property name="minHeight">400</Property>
			<Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
			<Property name="minWidth">500</Property>
			<Property name="minWidth">1000</Property>
			<Property name="autoOpen">true</Property>
			<Container layout="regionPadding:5">
			<DataSet id="dsNotice">
			@@ -902,13 +902,34 @@
			}</ClientEvent>
			<Property name="dataSet">dsNotice</Property>
			<Property name="readOnly">true</Property>
			<DataColumn name="name">
			<Property name="property">name</Property>
			<Property name="align">center</Property>
			<Property name="width">100</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">customerName</Property>
			<Property name="align">center</Property>
			<Property name="name">customerName</Property>
			<Property name="width">240</Property>
			</DataColumn>
			<DataColumn name="name">
			<Property name="property">name</Property>
			<DataColumn name="foodVariety">
			<Property name="property">foodVariety</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="year">
			<Property name="property">year</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="depotId">
			<Property name="property">depotId</Property>
			<Property name="align">center</Property>
			<Property name="width">180</Property>
			</DataColumn>
			<DataColumn name="contractName">
			<Property name="property">contractName</Property>
			<Property name="align">center</Property>
			<Property name="width">300</Property>
			</DataColumn>
			</DataGrid>
			</Container>

			@@ -1,6 +1,7 @@
			package com.ld.igds.m.dto;

			import lombok.Data;

			import java.util.Date;

			/**
			@@ -82,4 +83,9 @@
			*/
			private Date completeTime;

			/**
			* 所属合同
			*/
			private String contractName;

			}

			@@ -15,6 +15,7 @@
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Autowired;
			import org.springframework.stereotype.Repository;

			import java.util.*;

			@Repository
			@@ -257,6 +258,7 @@

			/**
			* 根据参数查询出入库通知单
			*
			* @param parameter
			* @return
			*/
			@@ -274,12 +276,12 @@
			}else {
			hql += InoutNoticeOut.class.getName();
			}
			hql += " where companyId =:companyId and deptId =:deptId";
			hql += " where companyId =:companyId and deptId =:deptId and completeStatus =:completeStatus";

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

			args.put("completeStatus", "NONE");
			String str = (String) parameter.get("customerId");
			if (StringUtils.isNotEmpty(str)) {
			hql += " and customerId =:customerId";
			@@ -325,6 +327,7 @@

			/**
			* 根据id获取通知单信息
			*
			* @param id
			* @param type
			* @return

			@@ -39,6 +39,9 @@
			</PropertyDef>
			</DataType>
			<DataType name="dtMain">
			<ClientEvent name="onDataChange">if(arg.property =="customerId"){
			autoByCustomer(arg.newValue);
			}</ClientEvent>
			<Property name="creationType">com.ld.igds.models.InoutContract</Property>
			<PropertyDef name="id">
			<Property></Property>
			@@ -371,7 +374,18 @@
			</Model>
			<View layout="regionPadding:10">
			<ClientEvent name="onReady">var deptId = window.parent.deptId;//父页面中的分库编码

			//根据客户自动回填客户类型，客户开户行，客户开户行账号，客户签约人
			autoByCustomer = function(id){
			view.get("#ajaxGetCustomer").set("parameter",id).execute(function(result){
			if(result){
			var data = view.get("#dsMain.data:#");
			data.set("customerType",result.khlx);
			data.set("customerBank",result.bank);
			data.set("customerBankAccount",result.bankNum);
			data.set("customerSignUser",result.fddbr);
			}
			});
			};
			addMain = function(){
			view.get("#dsMain").insert({});
			view.get("#dialogMain").show();
			@@ -760,6 +774,9 @@
			<Property name="confirmMessage">确定要删除吗？</Property>
			<Property name="service">contractManagePR#delContract</Property>
			</AjaxAction>
			<AjaxAction id="ajaxGetCustomer">
			<Property name="service">inoutCustomerPR#queryListByParam</Property>
			</AjaxAction>
			<CustomDropDown id="ddCustomer">
			<Property name="minHeight">400</Property>
			<Property name="assignmentMap">customerId=id,customerName=name</Property>

			@@ -2,6 +2,7 @@

			import java.text.Collator;
			import java.util.*;

			import com.ld.igds.m.service.HInoutCustomerService;
			import com.ld.igds.models.InoutCustomer;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -16,7 +17,6 @@
			* @description:
			* @version:
			* @data:2020年3月12日
			*
			*/
			@Component("inoutCustomerPR")
			public class InoutCustomerPR {
			@@ -78,4 +78,21 @@
			public String delData(InoutCustomer data) {
			return customerService.delData(data);
			}


			/**
			* inoutCustomerPR#queryListByParam
			* 根据关键字查询，ID
			*
			* @param
			* @return
			*/
			@Expose
			public InoutCustomer queryListByParam(String id) {
			Map<String, Object> param = new HashMap<>();
			param.put("id", id);
			List<InoutCustomer> list = customerService.queryList(param);

			return list.get(0);
			}
			}

			@@ -554,6 +554,12 @@
			</PropertyDef>
			<PropertyDef name="depotId">
			<Property></Property>
			<Property name="label">所涉仓库</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="customerId">
			<Property></Property>
			@@ -564,12 +570,19 @@
			</PropertyDef>
			<PropertyDef name="foodVariety">
			<Property></Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
			<Property name="keyProperty">code</Property>
			<Property name="valueProperty">name</Property>
			</Property>
			<Property name="label">粮食品种</Property>
			</PropertyDef>
			<PropertyDef name="foodType">
			<Property></Property>
			</PropertyDef>
			<PropertyDef name="year">
			<Property></Property>
			<Property name="label">年份</Property>
			</PropertyDef>
			<PropertyDef name="targetNumber">
			<Property name="dataType">double</Property>
			@@ -580,5 +593,12 @@
			<PropertyDef name="completeTime">
			<Property name="dataType">Date</Property>
			</PropertyDef>
			<PropertyDef name="unitName">
			<Property/>
			</PropertyDef>
			<PropertyDef name="contractName">
			<Property/>
			<Property name="label">所属合同</Property>
			</PropertyDef>
			</DataType>
			</Model>