调整计划管理模块

jiazx0107@163.com

2023-05-17 a87eff704037284e46568c7c7b8a60caaae884c2

调整计划管理模块

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1501.java

@@ -5,7 +5,7 @@
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.MPlan;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1501;
import com.ld.igds.sh.param.ApiRequest;
@@ -62,7 +62,7 @@
        redisUtil.set(key, param.getEndTime());

        //查询计划信息
        List<MPlan> dataList = hApiShServiceImpl.listPlan(companyId,
        List<InoutPlan> dataList = hApiShServiceImpl.listPlan(companyId,
                InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());

        //响应数据为空则直接返回响应码2000
@@ -75,7 +75,7 @@
        InteStatusLog log;
        InteStatusLog addLog;
        //封装数据信息
        for (MPlan plan : dataList) {
        for (InoutPlan plan : dataList) {
            dto1501 = new Dto1501();
            dto1501.setJhbm(plan.getId());
            dto1501.setJhnd(StringUtils.isEmpty(plan.getYear())?DateFormatUtils.format(plan.getCreateTime(), "yyyy"):plan.getYear());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/ApiShServiceImpl1502.java

@@ -6,8 +6,8 @@
import com.ld.igds.log.service.InteStatusLogService;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.InteStatusLog;
import com.ld.igds.models.MPlan;
import com.ld.igds.models.MPlanDetail;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sh.dto.ApiResponse;
import com.ld.igds.sh.dto.Dto1502;
import com.ld.igds.sh.param.ApiRequest;
@@ -63,16 +63,16 @@
        redisUtil.set(key, param.getEndTime());

        //查询轮换计划信息
        List<MPlan> planList = hApiShServiceImpl.listPlan(companyId,
        List<InoutPlan> planList = hApiShServiceImpl.listPlan(companyId,
                InoutManageUtil.PLAN_TYPE_3, startTime, param.getEndTime());
        if (planList == null || planList.isEmpty()) {
            return RespUtil.error(RespCodeEnum.CODE_2000.getCode(), request);
        }

        //查询轮换明细计划信息
        List<MPlanDetail> list0 = new ArrayList<>();
        List<MPlanDetail> dataList;
        for (MPlan plan : planList) {
        List<InoutPlanDetail> list0 = new ArrayList<>();
        List<InoutPlanDetail> dataList;
        for (InoutPlan plan : planList) {
            dataList = hApiShServiceImpl.getPlanDetail(plan.getId());
            if(null != dataList){
                list0.addAll(dataList);
@@ -90,7 +90,7 @@
        //查询库区信息
        List<DefaultDept> deptList = hApiShServiceImpl.listDept(companyId, companyId);
        DefaultDept dept = deptList.get(0);
        for (MPlanDetail planDetail : list0) {
        for (InoutPlanDetail planDetail : list0) {
            dto1502 = new Dto1502();

            dto1502.setJhmxbm(planDetail.getId());

 igds-api-inte/src/main/java/com/ld/igds/sh/service/impl/HApiShServiceImpl.java

@@ -4,7 +4,6 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.models.*;
import com.ld.igds.util.DateUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
import org.springframework.stereotype.Component;
@@ -721,8 +720,8 @@
     * @param endTime
     * @return
     */
    public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
        String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
    public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
        String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);
@@ -751,9 +750,9 @@
     * @param planId
     * @return
     */
    public List<MPlanDetail> getPlanDetail(String planId) {
    public List<InoutPlanDetail> getPlanDetail(String planId) {

        String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
        String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("planId", planId);

 igds-api-inte/src/main/java/com/ld/igds/three/ThreeCodeEnum.java

 igds-api-inte/src/main/java/com/ld/igds/three/ThreeConstant.java

 igds-api-inte/src/main/java/com/ld/igds/three/controller/ThreeController.java

@@ -16,7 +16,9 @@
import com.ld.igds.three.util.ThreeRespUtil;
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.FilesUtil;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

 igds-api-inte/src/main/java/com/ld/igds/three/manager/ThreeManager.java

@@ -6,6 +6,7 @@
import com.ld.igds.three.param.ThreeRequest;
import com.ld.igds.three.service.ThreeService;
import com.ld.igds.three.util.ThreeRespUtil;

import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;

 igds-api-phone/src/main/java/com/ld/igds/phone35/service/impl/HPhoneServiceImpl.java

@@ -584,8 +584,8 @@
     * @param endTime
     * @return
     */
    public List<MPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
        String hql = " from " + MPlan.class.getName() + " where companyId =:companyId";
    public List<InoutPlan> listPlan(String companyId, String type, Date startTime, Date endTime) {
        String hql = " from " + InoutPlan.class.getName() + " where companyId =:companyId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("companyId", companyId);
@@ -614,9 +614,9 @@
     * @param planId
     * @return
     */
    public List<MPlanDetail> getPlanDetail(String planId) {
    public List<InoutPlanDetail> getPlanDetail(String planId) {

        String hql = " from " + MPlanDetail.class.getName() + " where planId =:planId";
        String hql = " from " + InoutPlanDetail.class.getName() + " where planId =:planId";

        Map<String, Object> args = new HashMap<String, Object>();
        args.put("planId", planId);

 igds-core/src/main/java/com/ld/igds/constant/TransType.java

@@ -7,8 +7,8 @@
    TYPE_1("1", "汽车"),
    TYPE_2("2", "火车"),
    TYPE_3("3", "轮船"),
    TYPE_9("9", "其他"),
    ;
    TYPE_9("9", "其他");

    private String code;
    private String name;


 igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java

@@ -10,207 +10,234 @@
 */
public class InoutConstant {

    /**
     * é»˜è®¤èº«ä»½è¯
     */
    public static final String DEFAULT_ID_CARD = "100000000000000000";
    /**
     * é»˜è®¤èº«ä»½è¯
     */
    public static final String DEFAULT_ID_CARD = "100000000000000000";

    /**
     * ç¼“å­˜-入库ID
     */
    public static final String CACHE_RECORD_ID = "RECORD_ID";
    /**
     * ç¼“å­˜-入库ID
     */
    public static final String CACHE_RECORD_ID = "RECORD_ID";

    /**
     * ç¼“å­˜KEY-出入库配置信息缓存
     */
    public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";
    /**
     * ç¼“å­˜KEY-出入库配置信息缓存
     */
    public static final String CACHE_INOUT_CONF_LIST = "INOUT_CONF";

    /**
     * ç¼“å­˜KEY-出入库流程配置信息
     */
    public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";
    /**
     * ç¼“å­˜KEY-出入库流程配置信息
     */
    public static final String CACHE_INOUT_SYS_CONF = "INOUT_SYS_CONF";

    /**
     * ä¸´æ—¶ç¼“存，存放当前的出入库信息
     */
    public static final String KEY_INOUT_LIST = "INOUT_LIST";
    /**
     * ä¸´æ—¶ç¼“存，存放当前的出入库信息
     */
    public static final String KEY_INOUT_LIST = "INOUT_LIST";

    /**
     * ä¸´æ—¶ç¼“存，存放当前的出入库信息时间，出入库缓存可能存在两天完成的情况，时间调整为48小时
     */
    public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;
	
	
    /**
     * ä¸´æ—¶ç¼“存，存放当日已经完成的出入库信息
     */
    public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";
	
    /**
     * å½“日完成的出入库信息任务列表
     */
    public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;
	
	

    // æ‰¦æ ·-化验状态
    public static final String STATUS_NONE = "NONE";
    // æ‰¦æ ·-化验状态
    public static final String STATUS_PASS = "PASS";
    // æ‰¦æ ·-化验状态
    public static final String STATUS_UNPASS = "UNPASS";

    /**
     * åŒ–验不合格进行方式
     */
    public static final String CHECK_NOPASS_NORMAL = "0";  //正常流转
    public static final String CHECK_NOPASS_BACK = "1";   //出库收卡
    public static final String CHECK_NOPASS_RECORD = "2";   //流程结束

    // å®ŒæˆçŠ¶æ€-未完成
    public static final String COMPLETE_STATUS_NONE = "NONE";
    // å®ŒæˆçŠ¶æ€-已完成
    public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";

    /** è®¾å¤‡çŠ¶æ€-未知状态 */
    public static final String MAC_STATUS_NONE = "NONE";
    /** è®¾å¤‡çŠ¶æ€-正常状态 */
    public static final String MAC_STATUS_NORMAL = "NORMAL";
    /** è®¾å¤‡çŠ¶æ€-未连接、无信号 */
    public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";

    /**
     * å‡ºå…¥åº“配置的类型 10 = è½¦ç‰Œè¯†åˆ«
     */
    public static final String CONF_TYPE_10 = "10";

    /**
     * å‡ºå…¥åº“配置的类型 20 = æ‰¦æ ·æœºå™¨
     */
    public static final String CONF_TYPE_20 = "20";

    /**
     * å‡ºå…¥åº“配置的类型 21 = åŒ–验机
     */
    public static final String CONF_TYPE_21 = "21";

    /**
     * å‡ºå…¥åº“配置的类型 30 = åœ°ç£…
     */
    public static final String CONF_TYPE_30 = "30";

    /**
     * å‡ºå…¥åº“配置的类型40 = LED显示屏幕
     */
    public static final String CONF_TYPE_40 = "40";
	
    /**
     * åŒ–验大屏视频
     */
    public static final String CONF_TYPE_50 = "50";

    /**
     * å‡ºå…¥åº“抓拍摄像头
     */
    public static final String CONF_TYPE_60 = "60";

    /**
     * ç§°é‡ä¸»æŽ§åˆ¶å™¨
     */
    public static final String CONF_TYPE_70 = "70";

    /**
     * æ™ºæ…§å¡
     */
    public static final String CONF_TYPE_80 = "80";

    // å‡ºå…¥åº“类型-入库
    public static final String TYPE_IN = "IN";

    // å‡ºå…¥åº“类型-出库
    public static final String TYPE_OUT = "OUT";

    public static final String TYPE_NONE = "NONE";

    // æ•°æ®çŠ¶æ€-正常
    public static final String RECORD_STATUS_NORMAL = "NORMAL";
    // æ•°æ®çŠ¶æ€-异常
    public static final String RECORD_STATUS_ERROR = "ERROR";
    // æ•°æ®çŠ¶æ€-补录
    public static final String RECORD_STATUS_ADD = "ADD";
    // æ•°æ®çŠ¶æ€-已删除
    public static final String RECORD_STATUS_DEL = "DEL";

    // æµç¨‹-登记
    public static final String PROGRESS_REGISTER = "REGISTER";
    // æµç¨‹-入库质检
    public static final String PROGRESS_CHECK = "CHECK";
    // æµç¨‹-值仓
    public static final String PROGRESS_HANDLE = "HANDLE";
    // æµç¨‹-称重，包括满车称重或者空车称重，当前状态比较特殊，不作为流程节点，只作为标签
    public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
    // æµç¨‹-满车称重
    public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
    // æµç¨‹-空车称重
    public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
    // æµç¨‹-结算
    public static final String PROGRESS_PAY = "PAY";
    // æµç¨‹-卡片回收
    public static final String PROGRESS_CARD_BACK = "CARD_BACK";

    // æµç¨‹-备案（表示流程整体完成后备案）
    public static final String PROGRESS_RECORD = "RECORD";
    /**
     * ä¸´æ—¶ç¼“存，存放当前的出入库信息时间，出入库缓存可能存在两天完成的情况，时间调整为48小时
     */
    public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60;


    /**
     * ä¸´æ—¶ç¼“存，存放当日已经完成的出入库信息
     */
    public static final String KEY_INOUT_COMPLETE_LIST = "INOUT_COMPLETE";

    public static final String CHECK_ITEM_C01 = "C01";//水分

    public static final String CHECK_ITEM_C020101 = "020101";//水分

    public static final String CHECK_ITEM_C01010301 = "01010301";//杂质

    public static final String CHECK_ITEM_C02 = "C02";//杂质
    /**
     * å½“日完成的出入库信息任务列表
     */
    public static final long KEY_INOUT_COMPLETE_LIST_TIME = 8 * 60 * 60;


    // æ‰¦æ ·-化验状态
    public static final String STATUS_NONE = "NONE";
    // æ‰¦æ ·-化验状态
    public static final String STATUS_PASS = "PASS";
    // æ‰¦æ ·-化验状态
    public static final String STATUS_UNPASS = "UNPASS";

    /**
     * åŒ–验不合格进行方式
     */
    public static final String CHECK_NOPASS_NORMAL = "0";  //正常流转
    public static final String CHECK_NOPASS_BACK = "1";   //出库收卡
    public static final String CHECK_NOPASS_RECORD = "2";   //流程结束

    // å®ŒæˆçŠ¶æ€-未完成
    public static final String COMPLETE_STATUS_NONE = "NONE";
    // å®ŒæˆçŠ¶æ€-已完成
    public static final String COMPLETE_STATUS_COMPLETE = "COMPLETE";

    /**
     * è®¾å¤‡çŠ¶æ€-未知状态
     */
    public static final String MAC_STATUS_NONE = "NONE";
    /**
     * è®¾å¤‡çŠ¶æ€-正常状态
     */
    public static final String MAC_STATUS_NORMAL = "NORMAL";
    /**
     * è®¾å¤‡çŠ¶æ€-未连接、无信号
     */
    public static final String MAC_STATUS_NO_SIGNAL = "NO_SIGNAL";

    /**
     * å‡ºå…¥åº“配置的类型 10 = è½¦ç‰Œè¯†åˆ«
     */
    public static final String CONF_TYPE_10 = "10";

    /**
     * å‡ºå…¥åº“配置的类型 20 = æ‰¦æ ·æœºå™¨
     */
    public static final String CONF_TYPE_20 = "20";

    /**
     * å‡ºå…¥åº“配置的类型 21 = åŒ–验机
     */
    public static final String CONF_TYPE_21 = "21";

    /**
     * å‡ºå…¥åº“配置的类型 30 = åœ°ç£…
     */
    public static final String CONF_TYPE_30 = "30";

    /**
     * å‡ºå…¥åº“配置的类型40 = LED显示屏幕
     */
    public static final String CONF_TYPE_40 = "40";

    /**
     * åŒ–验大屏视频
     */
    public static final String CONF_TYPE_50 = "50";

    /**
     * å‡ºå…¥åº“抓拍摄像头
     */
    public static final String CONF_TYPE_60 = "60";

    /**
     * ç§°é‡ä¸»æŽ§åˆ¶å™¨
     */
    public static final String CONF_TYPE_70 = "70";

    /**
     * æ™ºæ…§å¡
     */
    public static final String CONF_TYPE_80 = "80";

    // å‡ºå…¥åº“类型-入库
    public static final String TYPE_IN = "IN";

    // å‡ºå…¥åº“类型-出库
    public static final String TYPE_OUT = "OUT";

    public static final String TYPE_NONE = "NONE";

    // æ•°æ®çŠ¶æ€-正常
    public static final String RECORD_STATUS_NORMAL = "NORMAL";
    // æ•°æ®çŠ¶æ€-异常
    public static final String RECORD_STATUS_ERROR = "ERROR";
    // æ•°æ®çŠ¶æ€-补录
    public static final String RECORD_STATUS_ADD = "ADD";
    // æ•°æ®çŠ¶æ€-已删除
    public static final String RECORD_STATUS_DEL = "DEL";

    // æµç¨‹-登记
    public static final String PROGRESS_REGISTER = "REGISTER";
    // æµç¨‹-入库质检
    public static final String PROGRESS_CHECK = "CHECK";
    // æµç¨‹-值仓
    public static final String PROGRESS_HANDLE = "HANDLE";
    // æµç¨‹-称重，包括满车称重或者空车称重，当前状态比较特殊，不作为流程节点，只作为标签
    public static final String PROGRESS_WEIGHT_TAG = "WEIGHT_TAG";
    // æµç¨‹-满车称重
    public static final String PROGRESS_WEIGHT_FULL = "WEIGHT_FULL";
    // æµç¨‹-空车称重
    public static final String PROGRESS_WEIGHT_EMPTY = "WEIGHT_EMPTY";
    // æµç¨‹-结算
    public static final String PROGRESS_PAY = "PAY";
    // æµç¨‹-卡片回收
    public static final String PROGRESS_CARD_BACK = "CARD_BACK";

    // æµç¨‹-备案（表示流程整体完成后备案）
    public static final String PROGRESS_RECORD = "RECORD";


    public static final String CHECK_ITEM_C01 = "C01";//水分

    public static final String CHECK_ITEM_C020101 = "020101";//水分

    public static final String CHECK_ITEM_C01010301 = "01010301";//杂质

    public static final String CHECK_ITEM_C02 = "C02";//杂质


    /**
     * è®¡åˆ’类型 -轮换计划
     **/
    public static final String PLAN_TYPE_01 = "01";
    /**
     * è®¡åˆ’类型 -采购计划
     **/
    public static final String PLAN_TYPE_02 = "02";
    /**
     * è®¡åˆ’类型 -销售计划
     **/
    public static final String PLAN_TYPE_03 = "03";
    /**
     * è®¡åˆ’类型 -生产加工计划
     **/
    public static final String PLAN_TYPE_04 = "04";

    /**
     * æ ¹æ®ä¸šåŠ¡ç±»åž‹å’Œ å½“前状态返回当前状态的流程名称
     *
     * @param type
     * @param progress
     * @return
     */
    public static String getProcessName(String type, String progress) {
    /**
     * è®¡åˆ’明细类型 -轮出计划
     **/
    public static final String PLAN_DETAIL_TYPE_1 = "1";

        if (PROGRESS_REGISTER.equals(progress))
            return "登记";
    /**
     * è®¡åˆ’明细类型 -轮入计划
     **/
    public static final String PLAN_DETAIL_TYPE_2 = "2";

        if (PROGRESS_CHECK.equals(progress))
            return "入库扦样流程";

        if (PROGRESS_HANDLE.equals(progress))
            return "值仓流程";
    /**
     * æ ¹æ®ä¸šåŠ¡ç±»åž‹å’Œ å½“前状态返回当前状态的流程名称
     *
     * @param type
     * @param progress
     * @return
     */
    public static String getProcessName(String type, String progress) {

        if (PROGRESS_WEIGHT_FULL.equals(progress))
            return "满车称重流程";
        if (PROGRESS_REGISTER.equals(progress))
            return "登记";

        if (PROGRESS_WEIGHT_EMPTY.equals(progress))
            return "空车称重流程";
        if (PROGRESS_CHECK.equals(progress))
            return "入库扦样流程";

        if (PROGRESS_PAY.equals(progress))
            return "结算流程";
        if (PROGRESS_HANDLE.equals(progress))
            return "值仓流程";

        if (PROGRESS_CARD_BACK.equals(progress))
            return "卡片回收";
        if (PROGRESS_WEIGHT_FULL.equals(progress))
            return "满车称重流程";

        if (PROGRESS_RECORD.equals(progress))
            return "流程完成";
        if (PROGRESS_WEIGHT_EMPTY.equals(progress))
            return "空车称重流程";

        return "";
    }
        if (PROGRESS_PAY.equals(progress))
            return "结算流程";

        if (PROGRESS_CARD_BACK.equals(progress))
            return "卡片回收";

        if (PROGRESS_RECORD.equals(progress))
            return "流程完成";

        return "";
    }

}

 igds-core/src/main/java/com/ld/igds/models/InoutRecord.java

@@ -92,16 +92,12 @@
    private String intelCard;

    @Column(name = "PLATE_NUM_", length = 20)
    @PropertyDef(label = "车牌号")
    @PropertyDef(label = "车船号", description = "车牌号+标识符")
    private String plateNum;

    @Column(name = "TRANS_TYPE_", length = 10)
    @PropertyDef(label = "运输方式", description = "汽车，火车、轮船、其他")
    @Column(name = "TRANS_TYPE_", length = 6)
    @PropertyDef(label = "运输工具")
    private String transType = TransType.TYPE_1.getCode();

    @Column(name = "SPEC_TYPE_", length = 10)
    @PropertyDef(label = "规格", description = "散粮，25kg, 50kg")
    private String specType = "散粮";

    @Column(name = "CUSTOMER_ID_", length = 40)
    @PropertyDef(label = "往来单位", description = "入库时，表示发货单位，出库时候表示收货单位")
@@ -123,7 +119,6 @@
    @Column(name = "FOOD_LEVEL_", length = 40)
    @PropertyDef(label = "粮食等级")
    private String foodLevel;


    @Column(name = "FOOD_LOCATION_", length = 40)
    @PropertyDef(label = "产地名称")
@@ -147,13 +142,13 @@
    private String checkId;

    // ç§°é‡å’Œæ‰£é‡ä¿¡æ¯
    @Column(name = "IMPURITY_")
    @PropertyDef(label = "杂质", description = "百分比")
    private Double impurity = 0.0;

    @Column(name = "WET_")
    @PropertyDef(label = "水分", description = "百分比")
    private Double wet = 0.0;
//    @Column(name = "IMPURITY_")
//    @PropertyDef(label = "杂质", description = "百分比")
//    private Double impurity = 0.0;
//
//    @Column(name = "WET_")
//    @PropertyDef(label = "水分", description = "百分比")
//    private Double wet = 0.0;

    @Column(name = "DE_IMPURITY_")
    @PropertyDef(label = "杂质扣重", description = "单位KG")
@@ -255,6 +250,10 @@
    private String settleTag = Constant.YN_N;


    @Column(name = "SPEC_TYPE_", length = 10)
    @PropertyDef(label = "规格", description = "散粮，25kg, 50kg")
    private String specType = "散粮";

    //--------版本4.0调整字段 --------------//
//    @Column(name = "jsdh", length = 42)
//    @PropertyDef(label = "结算单号")
@@ -279,8 +278,6 @@
//    @Column(name = "bzbjs", length = 2)
//    @PropertyDef(label = "包件数", description = "单位：件")
//    private int bzbjs;




    @Override

 igds-doc/sql/update-v35-to-v40.sql

@@ -1 +1,5 @@
-- ç‰ˆæœ¬V35升级V40脚本 ---2023å¹´5月17日

-- ä¿®æ”¹è®¡åˆ’表名称
RENAME TABLE D_M_PLAN TO D_INOUT_PLAN
RENAME TABLE D_M_PLAN_DETAIL TO D_INOUT_PLAN_DETAIL;

 igds-inout/src/main/java/com/ld/igds/inout/controller/CheckController.java

@@ -37,8 +37,7 @@
     */
    @RequestMapping("/check-exe")
    public @ResponseBody
    PageResponse<String> checkExe(
            @RequestBody SampleDto param) {
    PageResponse<String> checkExe(@RequestBody SampleDto param) {

        if (null == param.getIp()) {
            return new PageResponse<>(RespCodeEnum.CODE_1007.getCode(),

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

@@ -139,12 +139,12 @@
                            continue;
                        }

                        if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
                            result.setWet(Double.valueOf(checkItem.getValue()));
                        }
                        if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
                            result.setImpurity(Double.valueOf(checkItem.getValue()));
                        }
//                        if (InoutConstant.CHECK_ITEM_C01.equals(checkItem.getStandardId())) {
//                            result.setWet(Double.valueOf(checkItem.getValue()));
//                        }
//                        if (InoutConstant.CHECK_ITEM_C02.equals(checkItem.getStandardId())) {
//                            result.setImpurity(Double.valueOf(checkItem.getValue()));
//                        }
                    }
                }
            }
@@ -392,14 +392,14 @@
            progressData.setNoticeId(data.getNoticeId());
        }

        // å›žå¡«æ°´åˆ†å’Œæ‚è´¨
        if (checkResult.getWet() > 0) {
            progressData.setWet(checkResult.getWet());
        }

        if (checkResult.getImpurity() > 0) {
            progressData.setImpurity(checkResult.getImpurity());
        }
//        // å›žå¡«æ°´åˆ†å’Œæ‚è´¨
//        if (checkResult.getWet() > 0) {
//            progressData.setWet(checkResult.getWet());
//        }
//
//        if (checkResult.getImpurity() > 0) {
//            progressData.setImpurity(checkResult.getImpurity());
//        }

        String msg = inoutService.updateData(progressData);

@@ -817,8 +817,8 @@
            // å…ˆæ‰§è¡ŒåŒ–验信息保存
            CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(),data.getCheckItems());
            if (null != checkResult) {
                if (null == data.getWet())data.setWet(checkResult.getWet());
                if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
//                if (null == data.getWet())data.setWet(checkResult.getWet());
//                if (null == data.getImpurity())data.setImpurity(checkResult.getImpurity());
            }
        } else {
            if (null == data.getEmptyWeightTime()) {
@@ -888,10 +888,10 @@
                    .updateCheckItems(data.getCheckId(), data.getCompanyId(),
                            data.getCheckItems());
            if (null != checkResult) {
                if (null == data.getWet())
                    data.setWet(checkResult.getWet());
                if (null == data.getImpurity())
                    data.setImpurity(checkResult.getImpurity());
//                if (null == data.getWet())
//                    data.setWet(checkResult.getWet());
//                if (null == data.getImpurity())
//                    data.setImpurity(checkResult.getImpurity());
            }
        }


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

@@ -308,12 +308,12 @@
        bill.setDeSum(data.getDeSum() == null ? 0.0 :data.getDeSum());

        bill.setSettleWeight(data.getSettleWeight());
        if(data.getWet() != null && data.getWet() > 0){
            bill.setWet(data.getWet() +"");
        }
        if(data.getImpurity() != null && data.getImpurity() > 0){
            bill.setImpurity(data.getImpurity()+"");
        }
//        if(data.getWet() != null && data.getWet() > 0){
//            bill.setWet(data.getWet() +"");
//        }
//        if(data.getImpurity() != null && data.getImpurity() > 0){
//            bill.setImpurity(data.getImpurity()+"");
//        }

        bill.setPrice(data.getPrice()== null ? "" :data.getPrice() + "");
        if(data.getSettleMoney() <= 0){

 igds-inout/src/main/java/com/ld/igds/m/InoutManageUtil.java

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

import com.ld.igds.models.MPlan;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.util.ContextUtil;
import java.util.List;

@@ -79,7 +79,7 @@
     * 
     * @param type
     */
    public static String createPlanId(String type, String year, List<MPlan> list) {
    public static String createPlanId(String type, String year, List<InoutPlan> list) {
        String index = "001";
        if(list != null && list.size() > 0){
            String[] arr = list.get(0).getId().split("_");

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

@@ -3,8 +3,8 @@
import com.bstek.bdf2.core.orm.hibernate.HibernateDao;
import com.bstek.dorado.data.provider.Page;
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.models.MPlan;
import com.ld.igds.models.MPlanDetail;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.hibernate.Session;
@@ -19,9 +19,9 @@
@Component
public class HPlanManageService extends HibernateDao {

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

        Map<String, Object> args = new HashMap<String, Object>();
@@ -71,9 +71,9 @@



    public List<MPlanDetail> listPlanDetail(String planId) {
    public List<InoutPlanDetail> listPlanDetail(String planId) {
        
        String hql = " from " + MPlanDetail.class.getName();
        String hql = " from " + InoutPlanDetail.class.getName();
        
        if(null != planId){
            hql += " where planId=:planId ";
@@ -86,7 +86,7 @@
    }

    @Transactional
    public String delPlan(MPlan data) {
    public String delPlan(InoutPlan data) {
        Session session = this.getSessionFactory().openSession();
        try {
            if (null != data.getId()) {
@@ -102,7 +102,7 @@
        return null;
    }

    public String delPlanDetail(MPlanDetail data) {
    public String delPlanDetail(InoutPlanDetail data) {
        Session session = this.getSessionFactory().openSession();
        try {
            if (null != data.getId()) {
@@ -118,13 +118,13 @@
    }

    private void delPlanDetailByPlanId(String id, Session session) {
        String hql = " delete from " + MPlanDetail.class.getName()
        String hql = " delete from " + InoutPlanDetail.class.getName()
                + " where planId=:planId";

        session.createQuery(hql).setString("planId", id).executeUpdate();
    }

    public void savePlan(MPlan data) {
    public void savePlan(InoutPlan data) {
        if (null == data.getCompanyId()) {
            data.setCompanyId(ContextUtil.getCompanyId());
        }
@@ -134,7 +134,7 @@
        Session session = this.getSessionFactory().openSession();
        try {
            if (null == data.getId()) {
                List<MPlan> list = getPlanId(data);
                List<InoutPlan> list = getPlanId(data);
                data.setId(InoutManageUtil.createPlanId(data.getType(), data.getYear(), list));
                data.setCreateUser(ContextUtil.getLoginUserCName());
                data.setCreateTime(new Date());
@@ -151,15 +151,14 @@
        }
    }

    private void savePlanDetail(List<MPlanDetail> details, String planId,
            Session session) {
    private void savePlanDetail(List<InoutPlanDetail> details, String planId,
                                Session session) {
        if (null == details || details.isEmpty())
            return;
        for (MPlanDetail planDetail : details) {
        for (InoutPlanDetail planDetail : details) {
            if (null == planDetail.getId()) {
                planDetail.setPlanId(planId);
                planDetail.setId(ContextUtil.getUUID());
                planDetail.setCreateTime(new Date());
                session.save(planDetail);
            } else {
                session.update(planDetail);
@@ -167,8 +166,8 @@
        }
    }

    public List<MPlan> getPlanId(MPlan plan){
        String hql = " from " + MPlan.class.getName()
    public List<InoutPlan> getPlanId(InoutPlan plan){
        String hql = " from " + InoutPlan.class.getName()
                + " where companyId =:companyId and deptId =:deptId and year =:year";

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

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

@@ -206,7 +206,7 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>

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

@@ -206,7 +206,7 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>

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

@@ -206,7 +206,7 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>

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

@@ -171,7 +171,7 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>

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

@@ -214,7 +214,7 @@
      </PropertyDef>
    </DataType>
    <DataType name="dtPlan">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>

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

@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>
@@ -71,7 +71,7 @@
      </Reference>
    </DataType>
    <DataType name="dtDetail">
      <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID_</Property>

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

@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>
@@ -71,7 +71,7 @@
      </Reference>
    </DataType>
    <DataType name="dtDetail">
      <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID_</Property>

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

@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>
@@ -71,7 +71,7 @@
      </Reference>
    </DataType>
    <DataType name="dtDetail">
      <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID_</Property>

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

@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtMain">
      <Property name="creationType">com.ld.igds.models.MPlan</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlan</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">计划编码</Property>
@@ -71,7 +71,7 @@
      </Reference>
    </DataType>
    <DataType name="dtDetail">
      <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID_</Property>

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

@@ -8,8 +8,8 @@
import com.ld.igds.m.InoutManageUtil;
import com.ld.igds.m.service.HPlanManageService;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.MPlan;
import com.ld.igds.models.MPlanDetail;
import com.ld.igds.models.InoutPlan;
import com.ld.igds.models.InoutPlanDetail;
import com.ld.igds.sys.service.SysDeptService;
import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
@@ -126,7 +126,7 @@
     * @throws Exception
     */
    @DataProvider
    public void pagePlan(Page<MPlan> page, Map<String, Object> param) throws Exception {
    public void pagePlan(Page<InoutPlan> page, Map<String, Object> param) throws Exception {
        if (null == param) {
            param = new HashMap<String, Object>();
        }
@@ -141,7 +141,7 @@
     * @return
     */
    @DataProvider
    public List<MPlanDetail> listPlanDetail(String planId) {
    public List<InoutPlanDetail> listPlanDetail(String planId) {
        return service.listPlanDetail(planId);
    }

@@ -152,7 +152,7 @@
     * @param data
     */
    @DataResolver
    public void savePlan(MPlan data) {
    public void savePlan(InoutPlan data) {
        service.savePlan(data);
    }

@@ -164,7 +164,7 @@
     * @return
     */
    @Expose
    public String delPlan(MPlan data) {
    public String delPlan(InoutPlan data) {
        return service.delPlan(data);
    }
    
@@ -176,7 +176,7 @@
     * @return
     */
    @Expose
    public String delPlanDetail(MPlanDetail data){
    public String delPlanDetail(InoutPlanDetail data){
        return service.delPlanDetail(data);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,93 @@
package com.ld.igds.models;

import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.inout.InoutConstant;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;
import java.util.List;

/**
 * è®¡åˆ’管理-主表
 * <p>
 * åŒ…括：收购计划，销售计划，轮换记录，计划执行
 *
 * @author: andy.jia
 * @description: ç‰ˆæœ¬4.0字段已审
 * @version:
 * @data:2020å¹´5月27日
 */
@Data
@Entity
@Table(name = "D_INOUT_PLAN")
public class InoutPlan implements Serializable {

    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "计划编码")
    private String id;

    @Column(name = "COMPANY_ID_", length = 10)
    @PropertyDef(label = "组织编码")
    private String companyId;

    @Column(name = "DEPT_ID_", length = 40)
    @PropertyDef(label = "所属库区")
    private String deptId;

    @Column(name = "TYPE_", length = 10)
    @PropertyDef(label = "计划类型")
    private String type = InoutConstant.PLAN_TYPE_01;

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

    @Column(name = "REFERENCE_NUMBER_", length = 40)
    @PropertyDef(label = "计划文号")
    private String referenceNumber;

    @Column(name = "YEAR_", length = 10)
    @PropertyDef(label = "年份")
    private String year;

    @Column(name = "BEGIN_TIME_")
    @PropertyDef(label = "开始时间")
    private Date beginTime;

    @Column(name = "END_TIME_")
    @PropertyDef(label = "截止时间")
    private Date endTime;

    @PropertyDef(label = "计划下达单位")
    @Column(name = "jhxddw", length = 18)
    private String jhxddw;

    @PropertyDef(label = "计划下达时间")
    @Column(name = "jhxdsj")
    private Date jhxdsj;

    @Column(name = "CREATE_USER_", length = 30)
    @PropertyDef(label = "创建人")
    private String createUser;

    @Column(name = "CREATE_TIME_")
    @PropertyDef(label = "创建时间")
    private Date createTime;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;

    @Column(name = "REMARK_", length = 250)
    @PropertyDef(label = "备注")
    private String remark;

    @Transient
    private List<InoutPlanDetail> details;

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,71 @@
package com.ld.igds.models;

import com.bstek.dorado.annotation.PropertyDef;
import com.ld.igds.inout.InoutConstant;
import lombok.Data;

import javax.persistence.*;
import java.io.Serializable;
import java.util.Date;

/**
 * è®¡åˆ’，计划详细
 *
 * @DESC ç‰ˆæœ¬4.0 éªŒè¯
 */
@Data
@Entity
@Table(name = "D_INOUT_PLAN_DETAIL")
public class InoutPlanDetail implements Serializable {

    private static final long serialVersionUID = 1L;

    @Id
    @Column(name = "ID_", length = 40)
    @PropertyDef(label = "计划明细单号")
    private String id;

    @Column(name = "PLAN_ID_", length = 40)
    @PropertyDef(label = "计划编码")
    private String planId;

    @Column(name = "FOOD_VARIETY_", length = 10)
    @PropertyDef(label = "粮食品种")
    private String foodVariety;

    @Column(name = "FOOD_TYPE_", length = 10)
    @PropertyDef(label = "粮食性质")
    private String foodType;

    @Column(name = "FOOD_LEVEL_", length = 10)
    @PropertyDef(label = "粮食等级")
    private String foodLevel;

    @Column(name = "YEAR_", length = 10)
    @PropertyDef(label = "收获年度")
    private String year;

    @Column(name = "DEPOT_ID_", length = 50)
    @PropertyDef(label = "仓库")
    private String depotId;

    @Column(name = "PLAN_NUM_", precision = 16, scale = 2)
    @PropertyDef(label = "计划数量")
    private Double planNum;

    @Column(name = "TYPE_", length = 4)
    @PropertyDef(label = "计划类型")
    private String type = InoutConstant.PLAN_DETAIL_TYPE_1;

//    @Column(name = "PRICE_", precision = 16, scale = 2)
//    @PropertyDef(label = "单价")
//    private Double price;

//    @Column(name = "TOTAL_", precision = 16, scale = 2)
//    @PropertyDef(label = "总价")
//    private Double total;

    @Column(name = "UPDATE_TIME_")
    @PropertyDef(label = "数据更新时间")
    private Date updateTime;
}

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

 igds-manager/src/main/java/com/ld/igds/m/view/PlanManageAudit.view.xml

@@ -4,7 +4,7 @@
  <Context/>
  <Model>
    <DataType name="dtDetail">
      <Property name="creationType">com.ld.igds.models.MPlanDetail</Property>
      <Property name="creationType">com.ld.igds.models.InoutPlanDetail</Property>
      <PropertyDef name="id">
        <Property></Property>
        <Property name="label">ID_</Property>

 igds-web/src/main/resources/application.yml

@@ -1,7 +1,7 @@
##########################  Server   ##########################
spring:
  profiles:
    active: uat
    active: dev
  application:
    name: igds
  main:

 igds-web/src/main/resources/dorado-home/configure.properties

@@ -1,5 +1,5 @@
#core.runMode=debug
core.runMode=
core.runMode=debug
#core.runMode=

model.root=classpath*:models
view.root=classpath: