jiazx0107@163.com
2023-06-21 d8047152e563ba7816208a3fe9cf1ffdc9cddc83
Merge remote-tracking branch 'origin/master'
已添加3个文件
已修改11个文件
744 ■■■■■ 文件已修改
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml 28 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java 40 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java 37 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml 92 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml 304 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoDevice.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,17 @@
package com.ld.igds.phone35.dto;
import lombok.Data;
/**
 * @Author:YAN
 */
@Data
public class DtoDevice {
    private String name;
    private String status;
    private String statusName;
    private String passCode;
    private String location;
    private String serId;
    private String type;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/dto/DtoOrder.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,33 @@
package com.ld.igds.phone35.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
/**
 * å·¥å•列表
 *
 * @Author:YAN
 */
@Data
public class DtoOrder {
    private String id;
    private String type;
    private String depotId;
    private String depotName;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date startTime;
    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
    private Date endTime;
    private String status;
    private String statusName;
    private String info;
    private String applyUser;
    private String applyUserName;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/mapper/Phone35Mapper.java
@@ -92,4 +92,12 @@
     * @return
     */
    List<DtoVideo> getCamera(@Param("param") Phone35VideoCommonParam param);
    /**
     * å·¥å•列表
     *
     * @param param
     * @return
     */
    List<DtoOrder> getOrderList(@Param("param") Phone35OrderCommonParam param);
}
igds-api-phone/src/main/java/com/ld/igds/phone35/param/Phone35OrderCommonParam.java
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,19 @@
package com.ld.igds.phone35.param;
import lombok.Data;
/**
 * @Author:YAN
 */
@Data
public class Phone35OrderCommonParam extends Phone35CommonParam {
    private String userName;
    private String type;
    private String depotId;
    private String info;
    private String status;
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5702.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.DtoOrder;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.mapper.Phone35Mapper;
import com.ld.igds.phone35.param.Phone35OrderCommonParam;
import com.ld.igds.phone35.param.Phone35PatrolCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.Phone35Util;
import com.ld.igds.phone35.util.PhoneRespUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * å·¥å•记录
@@ -15,6 +26,12 @@
 */
@Service
public class Phone35ServiceImpl5702 implements Phone35Service {
    @Autowired
    private Phone35Util phone35Util;
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5702;
@@ -22,7 +39,21 @@
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
        Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getUserName())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoOrder> list = phone35Mapper.getOrderList(param);
        for (DtoOrder dtoOrder : list) {
            dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId()));
        }
        //todo å·¥å•记录
        return null;
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/Phone35ServiceImpl5703.java
@@ -1,12 +1,23 @@
package com.ld.igds.phone35.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.ld.igds.constant.OrderStatus;
import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.phone35.constant.Phone35Constant;
import com.ld.igds.phone35.dto.DtoOrder;
import com.ld.igds.phone35.dto.Phone35AuthUser;
import com.ld.igds.phone35.dto.PhoneResponse;
import com.ld.igds.phone35.mapper.Phone35Mapper;
import com.ld.igds.phone35.param.Phone35OrderCommonParam;
import com.ld.igds.phone35.param.Phone35Request;
import com.ld.igds.phone35.service.Phone35Service;
import com.ld.igds.phone35.util.Phone35Util;
import com.ld.igds.phone35.util.PhoneRespUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * å·¥å•审核列表
@@ -15,6 +26,12 @@
 */
@Service
public class Phone35ServiceImpl5703 implements Phone35Service {
    @Autowired
    private Phone35Util phone35Util;
    @Autowired
    private Phone35Mapper phone35Mapper;
    @Override
    public String getInterfaceId() {
        return Phone35Constant.API_PHONE_5703;
@@ -22,7 +39,22 @@
    @Override
    public PhoneResponse<Object> execute(Phone35Request<JSONObject> req, Phone35AuthUser phone35AuthUser) throws Exception {
        //转化对象
        Phone35OrderCommonParam param = JSONObject.parseObject(req.getData().toString(), Phone35OrderCommonParam.class);
        if (null == param) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        //参数验证
        if (StringUtils.isEmpty(param.getDeptId())) {
            return PhoneRespUtil.error(RespCodeEnum.CODE_1111, "参数有误,请重试!!");
        }
        param.setStatus(OrderStatus.Status_10.getCode());
        param.setCompanyId(phone35AuthUser.getCompanyId());
        List<DtoOrder> list = phone35Mapper.getOrderList(param);
        for (DtoOrder dtoOrder : list) {
            dtoOrder.setDepotName(phone35Util.getDepotName(phone35AuthUser.getCompanyId(), dtoOrder.getDepotId()));
        }
        //todo å·¥å•审核列表
        return null;
        return PhoneRespUtil.success(list, req);
    }
}
igds-api-phone/src/main/resources/mapper/Phone35Mapper.xml
@@ -181,4 +181,32 @@
        WHERE COMPANY_ID_ = #{param.companyId}
          AND DEPT_ID_ = #{param.deptId}
    </select>
    <select id="getOrderList" resultType="com.ld.igds.phone35.dto.DtoOrder">
        SELECT
        ID_ as id,
        COMPANY_ID_ as companyId,
        DEPT_ID_ as deptId,
        TYPE_ as type,
        DEPOT_ID_ as depotId,
        APPLY_USER_ as applyUser,
        APPLY_USER_NAME_ as applyUserName,
        APPLY_TIME_ as applyTime,
        AUDIT_USER_ as auditUser,
        AUDIT_USER_NAME_ as auditUserName,
        CONDUCT_USER_ as conductUser,
        AUDIT_TIME_ as auditTime,
        STATUS_ as status,
        RECORD_ as record,
        START_ as startTime,
        END_ as endTime
        FROM
        D_APPLY_ORDER
        <where>
            <if test="param.companyId != null and param.companyId != ''">and COMPANY_ID_ = #{param.companyId}</if>
            <if test="param.deptId != null and param.deptId != ''">and DEPT_ID_ = #{param.deptId}</if>
            <if test="param.userName != null and param.userName != ''">and APPLY_USER_ = #{param.userName}</if>
            <if test="param.status != null and param.status != ''">and STATUS_ = #{param.status}</if>
        </where>
        order by APPLY_TIME_ DESC
    </select>
</mapper>
igds-inout/src/main/java/com/ld/igds/m/service/HMAtockChangeService.java
@@ -4,11 +4,16 @@
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.models.InoutStockChange;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Service
@@ -47,10 +52,24 @@
        data.setUpdateTime(new Date());
        data.setUpdateUser(ContextUtil.getLoginUserCName());
        try {
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
            if (null == data.getCzbz()) {
                Map<String, Object> param = new HashMap<>();
                param.put("dateTime", data.getChangeDate());
                List<InoutStockChange> list = queryAll(param);
                int max = 0;
                if (list.size() != 0) {
                    int num;
                    for (InoutStockChange stockChange : list) {
                        num = Integer.parseInt(stockChange.getId().substring(stockChange.getId().length() - 4));
                        max = Math.max(max, num);
                    }
                }
                String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
                data.setId(date + String.format("%04d", max + 1));
                data.setCzbz("i");
                session.save(data);
            } else {
                data.setCzbz("u");
                session.update(data);
            }
        } catch (Exception e) {
@@ -60,6 +79,7 @@
            session.close();
        }
    }
    public String delData(InoutStockChange data) {
        Session session = this.getSessionFactory().openSession();
        try {
@@ -74,4 +94,20 @@
        }
        return null;
    }
    public List<InoutStockChange> queryAll(Map<String, Object> param) {
        String hql = "from " + InoutStockChange.class.getName() + " where 1 = 1 ";
        Map<String, Object> args = new HashMap<String, Object>();
        Date date = (Date) param.get("dateTime");
        if (null != date) {
            hql += " and updateTime >= :startTime and updateTime < :endTime";
            args.put("startTime", DateUtil.getCurZero(date));
            args.put("endTime", DateUtil.getNextZero(date));
        }
        hql += " order by  updateTime desc";
        return this.query(hql, args);
    }
}
igds-inout/src/main/java/com/ld/igds/m/service/HVarietyChangeService.java
@@ -2,9 +2,13 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.ld.igds.models.InoutStockChange;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -62,11 +66,26 @@
        }
        Session session = this.getSessionFactory().openSession();
        data.setUpdateTime(new Date());
        try {
            if (null == data.getId()) {
                data.setId(ContextUtil.getUUID());
                Map<String, Object> param = new HashMap<>();
                param.put("dateTime", data.getChangeTime());
                List<InoutVarietyChange> list = queryAll(param);
                int max = 0;
                if (list.size() != 0) {
                    int num;
                    for (InoutVarietyChange varietyChange : list) {
                        num = Integer.parseInt(varietyChange.getId().substring(varietyChange.getId().length() - 3));
                        max = Math.max(max, num);
                    }
                }
                String date = DateFormatUtils.format(new Date(), "yyyyMMdd");
                data.setId(data.getHwdm() + date + String.format("%03d", max + 1));
                data.setCzbz("i");
                session.save(data);
            } else {
                data.setCzbz("u");
                session.update(data);
            }
        } catch (Exception e) {
@@ -92,4 +111,20 @@
        return null;
    }
    public List<InoutVarietyChange> queryAll(Map<String, Object> param) {
        String hql = "from " + InoutVarietyChange.class.getName() +
                " where 1=1 ";
        Map<String, Object> args = new HashMap<String, Object>();
        Date date = (Date) param.get("dateTime");
        if (null != date) {
            hql += " and updateTime >= :startTime and updateTime < :endTime";
            args.put("startTime", DateUtil.getCurZero(date));
            args.put("endTime", DateUtil.getNextZero(date));
        }
        hql += " order by  updateTime desc";
        return this.query(hql, args);
    }
}
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -7,11 +7,13 @@
      <Property name="creationType">com.ld.igds.models.InoutStockChange</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID</Property>
        <Property name="label">倒仓单号</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="deptId">
        <Property></Property>
@@ -75,15 +77,45 @@
      <PropertyDef name="number">
        <Property name="dataType">Double</Property>
        <Property name="label">倒仓数量</Property>
        <Property name="displayFormat">#.00KG</Property>
        <Property name="displayFormat">#.00</Property>
      </PropertyDef>
      <PropertyDef name="updateTime">
        <Property name="dataType">Date</Property>
        <Property name="label">更新时间</Property>
        <Property name="label">最后更新时间</Property>
      </PropertyDef>
      <PropertyDef name="updateUser">
        <Property></Property>
        <Property name="label">更新人</Property>
      </PropertyDef>
      <PropertyDef name="dchwdm">
        <Property/>
        <Property name="label">倒出货位代码</Property>
      </PropertyDef>
      <PropertyDef name="drhwdm">
        <Property/>
        <Property name="label">倒入货位代码</Property>
      </PropertyDef>
      <PropertyDef name="bzw">
        <Property/>
        <Property name="label">包装物</Property>
        <Property name="mapping">
          <Property name="mapValues">${dorado.getDataProvider(&quot;stockChangePR#triggerBzw&quot;).getResult()}</Property>
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="bzbjs">
        <Property name="dataType">Integer</Property>
        <Property name="label">标准包件数</Property>
      </PropertyDef>
      <PropertyDef name="zxzydw">
        <Property/>
        <Property name="label">装卸作业单位</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -174,6 +206,7 @@
        <Property name="caption">刷新</Property>
        <Property name="exClassName">btn-default</Property>
        <Property name="iconClass">fa fa-refresh</Property>
        <Property name="visible">false</Property>
      </Button>
    </Container>
    <Container layout="regionPadding:10" layoutConstraint="center">
@@ -277,6 +310,7 @@
      <Property name="caption">详细信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">80%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -307,6 +341,16 @@
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">:</Property>
          <AutoFormElement>
            <Property name="name">id</Property>
            <Property name="property">id</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">companyId</Property>
            <Property name="property">companyId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">depotIdIn</Property>
            <Property name="property">depotIdIn</Property>
            <Editor/>
@@ -317,8 +361,29 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">deptId</Property>
            <Property name="property">deptId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">czbz</Property>
            <Property name="property">czbz</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">type</Property>
            <Property name="property">type</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">dchwdm</Property>
            <Property name="property">dchwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">drhwdm</Property>
            <Property name="property">drhwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -347,9 +412,18 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Property name="name">bzw</Property>
            <Property name="property">bzw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">bzbjs</Property>
            <Property name="property">bzbjs</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">zxzydw</Property>
            <Property name="property">zxzydw</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -358,6 +432,12 @@
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
      <Tools/>
igds-inout/src/main/java/com/ld/igds/m/view/StockChangePR.java
@@ -15,13 +15,12 @@
import java.util.Map;
/**
 * ç»¼åˆä¸šåŠ¡-粮食品种变更记录
 * ç»¼åˆä¸šåŠ¡-倒仓记录
 * 
 * @author: andy.jia
 * @description:
 * @version:
 * @data:2020å¹´5月28日
 *
 */
@Component
public class StockChangePR {
@@ -47,6 +46,24 @@
    }
    /**
     * åŒ…装物
     * ${dorado.getDataProvider("stockChangePR#triggerBzw").getResult()}
     *
     * @return
     */
    @DataProvider
    public List<DicTrigger> triggerBzw() {
        List<DicTrigger> list = new ArrayList<DicTrigger>();
        list.add(new DicTrigger("1", "麻袋"));
        list.add(new DicTrigger("2", "编织袋"));
        list.add(new DicTrigger("3", "散装"));
        list.add(new DicTrigger("9", "其他"));
        return list;
    }
    /**
     * stockChangePR#pageData
     * 
     * @param page
igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -7,11 +7,13 @@
      <Property name="creationType">com.ld.igds.models.InoutVarietyChange</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID</Property>
        <Property name="label">粮食性质转变单号</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="companyId">
        <Property></Property>
        <Property name="label">组织编码</Property>
        <Property name="readOnly">true</Property>
      </PropertyDef>
      <PropertyDef name="approvalId">
        <Property></Property>
@@ -46,16 +48,6 @@
          <Property name="keyProperty">code</Property>
          <Property name="valueProperty">name</Property>
        </Property>
      </PropertyDef>
      <PropertyDef name="newFoodVariety">
        <Property></Property>
        <Property name="label">变更后品种</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="required">false</Property>
      </PropertyDef>
      <PropertyDef name="foodType">
        <Property></Property>
@@ -98,13 +90,77 @@
        <Property name="dataType">DateTime</Property>
        <Property name="label">更新时间</Property>
      </PropertyDef>
      <PropertyDef name="updateUser">
        <Property></Property>
        <Property name="label">更新人</Property>
      </PropertyDef>
      <PropertyDef name="remark">
        <Property></Property>
        <Property name="label">备注</Property>
      </PropertyDef>
      <PropertyDef name="hwdm">
        <Property/>
        <Property name="label">货位代码</Property>
      </PropertyDef>
      <PropertyDef name="ccshr">
        <Property/>
        <Property name="label">仓储审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditCcsh">
        <Property/>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="InfoCcsh">
        <Property/>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="zjshr">
        <Property/>
        <Property name="label">质检审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditZjsh">
        <Property/>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoZjsh">
        <Property/>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="tjshr">
        <Property/>
        <Property name="label">统计审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditTjsh">
        <Property/>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoTjsh">
        <Property/>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="kjshr">
        <Property/>
        <Property name="label">会计审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditKjsh">
        <Property/>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoKjsh">
        <Property/>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="ldshr">
        <Property/>
        <Property name="label">领导审核人</Property>
      </PropertyDef>
      <PropertyDef name="auditLdsh">
        <Property/>
        <Property name="label">审批状态</Property>
      </PropertyDef>
      <PropertyDef name="infoLdsh">
        <Property/>
        <Property name="label">审核说明</Property>
      </PropertyDef>
      <PropertyDef name="czbz">
        <Property/>
        <Property name="label">操作标志</Property>
      </PropertyDef>
    </DataType>
    <DataType name="dtParam">
@@ -204,6 +260,7 @@
        <Property name="caption">刷新</Property>
        <Property name="exClassName">btn-default</Property>
        <Property name="iconClass">fa fa-refresh</Property>
        <Property name="visible">false</Property>
      </Button>
    </Container>
    <Container layout="regionPadding:10" layoutConstraint="center">
@@ -250,20 +307,12 @@
          <Property name="property">foodVariety</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="newFoodVariety">
          <Property name="property">newFoodVariety</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="changeTime">
          <Property name="property">changeTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateTime">
          <Property name="property">updateTime</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="updateUser">
          <Property name="property">updateUser</Property>
          <Property name="align">center</Property>
        </DataColumn>
        <DataColumn name="remark">
@@ -279,10 +328,11 @@
      </DataPilot>
    </Container>
    <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
      <Property name="width">800</Property>
      <Property name="width">60%</Property>
      <Property name="caption">粮食品种变更信息</Property>
      <Property name="iconClass">fa fa-flag-o</Property>
      <Property name="closeable">false</Property>
      <Property name="height">80%</Property>
      <Buttons>
        <Button>
          <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -306,15 +356,29 @@
        </Button>
      </Buttons>
      <Children>
        <FieldSet>
          <Property name="caption">基本信息</Property>
          <Buttons/>
          <Children>
        <AutoForm>
          <Property name="dataSet">dsMain</Property>
          <Property name="cols">*,*</Property>
          <Property name="labelWidth">120</Property>
              <Property name="labelWidth">140</Property>
          <Property name="labelAlign">right</Property>
          <Property name="labelSeparator">:</Property>
          <AutoFormElement>
                <Property name="name">id</Property>
                <Property name="property">id</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
            <Property name="name">depotId</Property>
            <Property name="property">depotId</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">companyId</Property>
                <Property name="property">companyId</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -323,13 +387,13 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">foodVariety</Property>
            <Property name="property">foodVariety</Property>
                <Property name="name">hwdm</Property>
                <Property name="property">hwdm</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">newFoodVariety</Property>
            <Property name="property">newFoodVariety</Property>
                <Property name="name">foodVariety</Property>
                <Property name="property">foodVariety</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
@@ -358,24 +422,190 @@
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateUser</Property>
            <Property name="property">updateUser</Property>
                <Property name="name">updateTime</Property>
                <Property name="property">updateTime</Property>
                <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
              <AutoFormElement>
                <Property name="name">czbz</Property>
                <Property name="property">czbz</Property>
                <Editor/>
              </AutoFormElement>
              <AutoFormElement>
                <Property name="name">deptId</Property>
                <Property name="property">deptId</Property>
                <Editor/>
              </AutoFormElement>
            </AutoForm>
          </Children>
        </FieldSet>
        <FieldSet>
          <Property name="caption">审批信息</Property>
          <Buttons/>
          <Children>
            <FieldSet>
              <Property name="caption">仓储审批</Property>
              <Buttons/>
              <Children>
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <AutoFormElement>
                    <Property name="name">ccshr</Property>
                    <Property name="property">ccshr</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement>
                    <Property name="name">auditCcsh</Property>
                    <Property name="property">auditCcsh</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
                    <Property name="name">InfoCcsh</Property>
                    <Property name="property">InfoCcsh</Property>
                    <Editor/>
                  </AutoFormElement>
                </AutoForm>
              </Children>
            </FieldSet>
            <FieldSet>
              <Property name="caption">质检审批</Property>
              <Buttons/>
              <Children>
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <AutoFormElement>
                    <Property name="name">zjshr</Property>
                    <Property name="property">zjshr</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement>
                    <Property name="name">auditZjsh</Property>
                    <Property name="property">auditZjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
                    <Property name="name">infoZjsh</Property>
                    <Property name="property">infoZjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                </AutoForm>
              </Children>
            </FieldSet>
            <FieldSet>
              <Property name="caption">统计审批</Property>
              <Buttons/>
              <Children>
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelWidth">120</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelAlign">right</Property>
                  <AutoFormElement>
                    <Property name="name">tjshr</Property>
                    <Property name="property">tjshr</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement>
                    <Property name="name">auditTjsh</Property>
                    <Property name="property">auditTjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement layoutConstraint="colSpan:2;rowSpan:2">
                    <Property name="name">infoTjsh</Property>
                    <Property name="property">infoTjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                </AutoForm>
              </Children>
            </FieldSet>
            <FieldSet>
              <Property name="caption">会计审批</Property>
              <Buttons/>
              <Children>
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">120</Property>
                  <AutoFormElement>
                    <Property name="name">kjshr</Property>
                    <Property name="property">kjshr</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement>
                    <Property name="name">auditKjsh</Property>
                    <Property name="property">auditKjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
                    <Property name="name">infoKjsh</Property>
                    <Property name="property">infoKjsh</Property>
                    <Editor/>
                  </AutoFormElement>
                </AutoForm>
              </Children>
            </FieldSet>
            <FieldSet>
              <Property name="caption">领导审批</Property>
              <Buttons/>
              <Children>
                <AutoForm>
                  <Property name="cols">*,*</Property>
                  <Property name="dataSet">dsMain</Property>
                  <Property name="labelAlign">right</Property>
                  <Property name="labelSeparator">:</Property>
                  <Property name="labelWidth">140</Property>
                  <AutoFormElement>
                    <Property name="name">ldshr</Property>
                    <Property name="property">ldshr</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement>
                    <Property name="name">auditLdsh</Property>
                    <Property name="property">auditLdsh</Property>
                    <Editor/>
                  </AutoFormElement>
                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
                    <Property name="name">infoLdsh</Property>
                    <Property name="property">infoLdsh</Property>
                    <Editor/>
                  </AutoFormElement>
                </AutoForm>
              </Children>
            </FieldSet>
          </Children>
        </FieldSet>
        <FieldSet>
          <Property name="caption">备注信息</Property>
          <Buttons/>
          <Children>
            <AutoForm>
              <Property name="cols">*,*</Property>
              <Property name="dataSet">dsMain</Property>
              <Property name="labelAlign">right</Property>
              <Property name="labelSeparator">:</Property>
              <Property name="labelWidth">120</Property>
          <AutoFormElement layoutConstraint="colSpan:2">
            <Property name="name">remark</Property>
            <Property name="property">remark</Property>
            <Property name="editorType">TextArea</Property>
            <Editor/>
          </AutoFormElement>
          <AutoFormElement>
            <Property name="name">updateTime</Property>
            <Property name="property">updateTime</Property>
            <Property name="readOnly">true</Property>
            <Editor/>
          </AutoFormElement>
        </AutoForm>
      </Children>
        </FieldSet>
      </Children>
      <Tools/>
    </Dialog>
    <UpdateAction id="uaAction">
igds-inout/src/main/java/com/ld/igds/models/InoutStockChange.java
@@ -19,10 +19,12 @@
@Table(name = "D_INOUT_STOCK_CHANGE")
public class InoutStockChange {
    /**
     * å€’仓单号
     */
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键")
    @Column(name = "ID_", length = 32)
    @PropertyDef(label = "倒仓单号", description = "由倒仓日期(yyyyMMdd)+4位顺序号组成")
    private String id;
    @Column(name = "COMPANY_ID_", length = 10)
@@ -46,7 +48,7 @@
    private String noticeId;
    @Column(name = "FOOD_VARIETY_", length = 10)
    @PropertyDef(label = "粮食品种")
    @PropertyDef(label = "粮食品种", description = "代码不足7位需在末位补0")
    private String foodVariety;
    @Column(name = "DEPOT_ID_IN", length = 50)
@@ -58,18 +60,43 @@
    private String depotIdOut;
    @Column(name = "CHANGE_DATE_")
    @PropertyDef(label = "倒仓日期")
    @PropertyDef(label = "倒仓日期", description = "yyyy-MM-dd")
    private Date changeDate;
    @Column(name = "NUMBER_")
    @PropertyDef(label = "倒仓数量")
    @PropertyDef(label = "倒仓数量", description = "单位:公斤")
    private Double number = 0.0;
    @Column(name = "czbz", length = 1)
    @PropertyDef(label = "操作标志", description = "i:新增数据(默认)u:更新数据 d:删除数据")
    private String czbz;
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    @PropertyDef(label = "最后更新时间")
    private Date updateTime;
    @Column(name = "UPDATE_USER_", length = 50)
    @PropertyDef(label = "更新人")
    private String updateUser;
    @Column(name = "dchwdm", length = 30)
    @PropertyDef(label = "倒出货位代码", description = "关联货位信息接口货位代码")
    private String dchwdm;
    @Column(name = "drhwdm", length = 30)
    @PropertyDef(label = "倒入货位代码", description = "关联货位信息接口货位代码")
    private String drhwdm;
    @Column(name = "bzw", length = 1)
    @PropertyDef(label = "包装物", description = "1:麻袋 2:编织袋 3:散装 9:其他")
    private String bzw;
    @Column(name = "bzbjs")
    @PropertyDef(label = "标准包件数", description = "单位:件")
    private Integer bzbjs = 0;
    @Column(name = "zxzydw", length = 256)
    @PropertyDef(label = "装卸作业单位", description = "装卸作业的人员姓名或单位名称,用半角逗号分隔")
    private String zxzydw;
}
igds-inout/src/main/java/com/ld/igds/models/InoutVarietyChange.java
@@ -23,13 +23,17 @@
    private static final long serialVersionUID = 1L;
    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "主键")
    @Column(name = "ID_", length = 41)
    @PropertyDef(label = "粮食性质转变单号", description = "由货位代码+划转日期(yyyyMMdd)+3位顺序号组成")
    private String id;
    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;
    @Column(name = "hwdm", length = 30)
    @PropertyDef(label = "货位代码", description = "关联货位信息接口货位代码")
    private String hwdm;
    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "分库编码")
@@ -40,11 +44,11 @@
    private String depotId;
    @Column(name = "NUMBER_")
    @PropertyDef(label = "粮食数量")
    @PropertyDef(label = "粮食数量", description = "单位:公斤")
    private Double number = 0.0;
    @Column(name = "CHANGE_NUMBER_")
    @PropertyDef(label = "划转数量")
    @PropertyDef(label = "划转数量", description = "单位:公斤")
    private Double changeNumber = 0.0;
    @Column(name = "APPROVAL_ID_", length = 40)
@@ -52,19 +56,29 @@
    private String approvalId;
    @Column(name = "FOOD_VARIETY_", length = 10)
    @PropertyDef(label = "粮食品种")
    @PropertyDef(label = "粮食品种", description = "代码不足7位需在末位补0")
    private String foodVariety;
    /**
     * 100、储备粮 110、中央储备粮 120、地方储备粮
     * 121、省(自治区、直辖市)级地方储备粮
     * 122、市(地区、自治州、盟)级地方储备粮
     * 123、县(自治县、县级市、旗、自治旗、市辖区、林区、特区)级地方储备粮
     * 129、其他储备粮 200、商品粮 270、中储粮系统商品粮
     * 280、进口商品粮 290、其他商品粮 300、政策性粮食
     * 310、最低收购价粮 320、国家临时存储粮 330、国家临储进口粮
     * 340、地方临时存储粮
     */
    @Column(name = "FOOD_TYPE_", length = 10)
    @PropertyDef(label = "原粮食性质")
    @PropertyDef(label = "划转前粮食性质代码")
    private String foodType;
    @Column(name = "NEW_FOOD_TYPE_", length = 10)
    @PropertyDef(label = "变更后性质")
    @PropertyDef(label = "划转后粮食性质代码")
    private String newFoodType;
    @Column(name = "CHANGE_TIME_")
    @PropertyDef(label = "变更时间")
    @PropertyDef(label = "划转日期")
    private Date changeTime;
    @PropertyDef(label = "仓储审核人")
@@ -127,8 +141,13 @@
    @PropertyDef(label = "审核说明")
    private String infoLdsh;
    @Column(name = "czbz", length = 1)
    @PropertyDef(label = "操作标志", description = "i:新增数据(默认)u:更新数据 d:删除数据")
    private String czbz;
    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "更新时间")
    @PropertyDef(label = "最后更新时间")
    private Date updateTime;
    @Column(name = "REMARK_", length = 200)