船运问题

YYC

2023-10-31 8728429603cdb25b5fc6245915dc829e78d81571

船运问题

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

@@ -29,6 +29,7 @@
import com.ld.igds.util.DateUtil;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -551,7 +552,6 @@
                data.setDepotId(item.getDepotId());
            }
            if (data.getDepotId().equals(item.getDepotId())) {

                inoutParam.setId(data.getRecordId());
            } else {
                String newId = data.getRecordId() + temp;
@@ -585,11 +585,15 @@
            map.put(inoutParam.getId(), inoutParam);
        }
        InoutParam par;
        InoutData dat;
        for (String key : map.keySet()) {
            par = map.get(key);
            if (par != null) {
                dat = new InoutData();
                //更新流水数据(包含重量信息以及流程进度信息)
                inoutService.toComplete(par);
                BeanUtils.copyProperties(par, dat);
                inoutService.updateData(dat);

//                //更新仓库库存
//                if (InoutConstant.TYPE_IN.equals(par.getType())) {

 igds-inout/src/main/java/com/ld/igds/inout/service/HInoutReportService.java

@@ -6,6 +6,7 @@
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;

import java.util.*;

@Component
@@ -48,10 +49,10 @@
                args.put("type", str);
            }

            str = (String) param.get("customerId");
            str = (String) param.get("noticeId");
            if (StringUtils.isNotEmpty(str)) {
                hql += " and customerId=:customerId ";
                args.put("customerId", str);
                hql += " and noticeId=:noticeId ";
                args.put("noticeId", str);
            }

            str = (String) param.get("progress");

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

@@ -14,6 +14,7 @@
      </PropertyDef>
      <PropertyDef name="userId">
        <Property name="label">身份证号</Property>
        <Property name="required">true</Property>
      </PropertyDef>
      <PropertyDef name="noticeId">
        <Property name="label">通知单号</Property>

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

@@ -19,7 +19,7 @@
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="customerId">
      <PropertyDef name="noticeId">
        <Property></Property>
        <Property name="label">发货单位</Property>
      </PropertyDef>
@@ -112,12 +112,6 @@
      <Property name="labelWidth">100</Property>
      <Property name="labelAlign">right</Property>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">type</Property>
        <Property name="property">type</Property>
        <Editor/>
@@ -125,8 +119,14 @@
      <AutoFormElement>
        <Property name="name">customerName</Property>
        <Property name="property">customerName</Property>
        <Property name="trigger">ddCustomer</Property>
        <Property name="trigger">ddNotice</Property>
        <Property name="editable">false</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
        <Property name="name">depotId</Property>
        <Property name="property">depotId</Property>
        <Property name="trigger">autoMappingDropDown2</Property>
        <Editor/>
      </AutoFormElement>
      <AutoFormElement>
@@ -375,5 +375,79 @@
        </DataGrid>
      </Container>
    </CustomDropDown>
    <CustomDropDown id="ddNotice">
      <ClientEvent name="onOpen">var data = view.get(&quot;#dsQuery.data&quot;);&#xD;
var type = data.get(&quot;type&quot;);&#xD;
if(type){&#xD;
    view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{type: type}).flushAsync();&#xD;
}else{&#xD;
    $alert(&quot;请先选择出入库类型&quot;)&#xD;
}&#xD;
</ClientEvent>
      <Property name="minHeight">400</Property>
      <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
      <Property name="minWidth">1000</Property>
      <Property name="autoOpen">true</Property>
      <Container layout="regionPadding:5">
        <DataSet id="dsNotice">
          <Property name="dataProvider">inoutNoticePR#queryNoticeByKey</Property>
          <Property name="dataType">[dtNoticeDto]</Property>
          <Property name="parameter"/>
        </DataSet>
        <Container layout="hbox regionPadding:5">
          <TextEditor id="key3">
            <Property name="blankText"> -- 客户名称或编码 --</Property>
            <Property name="width">200</Property>
          </TextEditor>
          <Button>
            <ClientEvent name="onClick">var key = view.get(&quot;#key3.value&quot;);&#xD;
var type = &quot;${request.getParameter('type')}&quot;;&#xD;
view.get(&quot;#dsNotice&quot;).set(&quot;parameter&quot;,{key: key,type: type}).flushAsync();</ClientEvent>
            <Property name="caption">查询</Property>
            <Property name="iconClass">fa fa-search</Property>
          </Button>
          <Button>
            <ClientEvent name="onClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
}</ClientEvent>
            <Property name="iconClass">fa fa-check</Property>
            <Property name="caption">确定</Property>
          </Button>
        </Container>
        <DataGrid>
          <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsNotice.data:#&quot;);&#xD;
if(data){&#xD;
    view.get(&quot;#ddNotice&quot;).close(data.toJSON());&#xD;
}</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="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="contractName">
            <Property name="property">contractName</Property>
            <Property name="align">center</Property>
            <Property name="width">300</Property>
          </DataColumn>
        </DataGrid>
      </Container>
    </CustomDropDown>
  </View>
</ViewConfig>