igds-core/src/main/java/com/ld/igds/check/CheckStandardManager.java
@@ -83,7 +83,6 @@ checkStandardService.insertCheckItem(item); } } return result; } } igds-core/src/main/java/com/ld/igds/inout/InoutConstant.java
@@ -38,7 +38,7 @@ /** * 临时缓存，存放当前的出入库信息时间，出入库缓存可能存在两天完成的情况，时间调整为48小时 */ public static final long KEY_INOUT_LIST_TIME = 48 * 60 * 60; public static final long KEY_INOUT_LIST_TIME = 72 * 60 * 60; /** igds-inout/src/main/java/com/ld/igds/inout/controller/InoutController.java
@@ -690,6 +690,19 @@ return inoutManager.submitComplete(data); } /** * 质检页面提交 * * @param data * @return */ @RequestMapping("/submit-check") @Transactional public PageResponse<InoutCheckData> submitCheck(@RequestBody InoutCheckData data)throws Exception { return inoutManager.submitCheck(data); } /** * 更新用户选择地磅，根据用户IP保存期选择 * @@ -753,17 +766,7 @@ return inoutManager.getCheckItemData(param); } /** * 化验页面提交更新 * * @param data * @return */ @RequestMapping("/update-check") public PageResponse<InoutCheckData> updateCheck1(@RequestBody InoutCheckData data) { return inoutManager.updateCheckData(data); } /** * 根据粮食等级及粮食品种获取粮食定价 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutManager.java
@@ -968,6 +968,84 @@ return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功"); } public PageResponse<InoutCheckData> submitCheck(InoutCheckData data) throws Exception { // 获取系统参数配置 InoutSysConf inoutSysConf = inoutCommonService.getCacheInoutSysConf(data.getCompanyId(), data.getDeptId()); if (null == inoutSysConf) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "提示：当前库区未配置出入库流程信息，请联系管理员", data); } // 获取业务数据信息 InoutParam param = new InoutParam(); param.setCompanyId(data.getCompanyId()); param.setId(data.getId()); InoutData curData = inoutService.inoutProgressQuery(param); if (null == curData) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "没有获取到入库业务数据信息，更新失败", data); } if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "当前流程已经结束，不支持修改"); } // 更新化验项信息 CheckUpdateResult checkResult = checkStandardManager.updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems()); if (StringUtils.isNotEmpty(checkResult.getMsg())) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "后台执行异常：" + checkResult.getMsg(), data); } // 设置化验信息 if (checkResult.getDeSum() > 0) { curData.setDeCheck(checkResult.getDeSum()); data.setDeCheck(checkResult.getDeSum()); } if (checkResult.getAddSum() > 0) { curData.setAddCheck(checkResult.getAddSum()); data.setAddCheck(checkResult.getAddSum()); } if (null == data.getCheckTime()) { curData.setCheckTime(new Date()); data.setCheckTime(new Date()); } curData.setCheckStatus(data.getCheckStatus()); // 获取下一个流程状态 String curProgress = curData.getProgress(); String nextProgress = getNextProgress(curProgress, curData.getType(), inoutSysConf); curData = updateBasicInfo(curData, curProgress, nextProgress); // 若化验结果不合格，判断配置后续流程 if (InoutConstant.STATUS_UNPASS.equals(curData.getCheckStatus())) { curData = checkNoPass(curData); } curData.setProgress(curData.getProgress()); curData.setType(curData.getType()); if (StringUtils.isEmpty(data.getCheckUser())) { curData.setCheckUser(ContextUtil.getLoginUserCName()); } if (null == data.getCheckTime()) { curData.setCheckTime(new Date()); } String msg = inoutService.updateCheckData(curData); if (null != msg) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg); } return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功"); } /** * @param param * @return @@ -1016,83 +1094,8 @@ } } @Transactional(rollbackFor = Exception.class) public PageResponse<InoutCheckData> updateCheckData(InoutCheckData data) { try { // 获取业务数据信息 InoutParam param = new InoutParam(); param.setCompanyId(data.getCompanyId()); param.setId(data.getId()); InoutData curData = inoutService.inoutProgressQuery(param); if (null == curData) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "没有获取到入库业务数据信息，更新失败", data); } if (InoutConstant.PROGRESS_RECORD.equals(curData.getProgress())) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "当前流程已经结束，不支持修改"); } // 更新化验项信息 CheckUpdateResult checkResult = checkStandardManager .updateCheckItems(data.getCheckId(), data.getCompanyId(), data.getCheckItems()); if (StringUtils.isNotEmpty(checkResult.getMsg())) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "后台执行异常：" + checkResult.getMsg(), data); } // 设置化验信息 if (checkResult.getDeSum() > 0) { data.setDeCheck(checkResult.getDeSum()); } if (checkResult.getAddSum() > 0) { data.setAddCheck(checkResult.getAddSum()); } if (null == data.getCheckTime()) { data.setCheckTime(new Date()); } curData.setCheckStatus(data.getCheckStatus()); // 获取系统参数配置 InoutSysConf inoutSysConf = inoutCommonService .getCacheInoutSysConf(data.getCompanyId(), data.getDeptId()); if (null == inoutSysConf) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "提示：当前库区未配置出入库流程信息，请联系管理员", data); } // 更新下一流程状态 if (InoutConstant.PROGRESS_CHECK.equals(curData.getProgress())) { curData = updateBasicInfo(curData, inoutSysConf); // 若化验结果不合格，判断配置后续流程 if (InoutConstant.STATUS_UNPASS .equals(curData.getCheckStatus())) { curData = checkNoPass(curData); } } // 化验人、化验时间 data.setCheckStatus(curData.getCheckStatus()); data.setProgress(curData.getProgress()); if (StringUtils.isEmpty(data.getCheckUser())) { data.setCheckUser(ContextUtil.getLoginUserCName()); } if (null == data.getCheckTime()) { data.setCheckTime(new Date()); } String msg = inoutService.updateCheckData(data); if (null != msg) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), msg); } return new PageResponse<>(RespCodeEnum.CODE_0000.getCode(), "执行成功"); } catch (Exception e) { return new PageResponse<>(RespCodeEnum.CODE_1111.getCode(), "后台异常：" + e.getMessage(), null); } } /** * 获取单价信息 igds-inout/src/main/java/com/ld/igds/inout/mapper/InoutCheckMapper.java
@@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.plugins.Page; import com.ld.igds.inout.dto.InoutCheckData; import com.ld.igds.inout.dto.InoutCheckParam; import com.ld.igds.inout.dto.InoutData; import com.ld.igds.models.InoutPrice; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -49,7 +50,7 @@ * @param data * @return */ int updateCheckData(@Param("data") InoutCheckData data); int updateCheckData(@Param("data") InoutData data); /** * 获取粮食定价 igds-inout/src/main/java/com/ld/igds/inout/service/InoutService.java
@@ -254,7 +254,7 @@ * @return * @throws Exception */ String updateCheckData(InoutCheckData data); String updateCheckData(InoutData data); /** * 获取粮食定价 igds-inout/src/main/java/com/ld/igds/inout/service/impl/InoutServiceImpl.java
@@ -208,7 +208,7 @@ //更新缓存 updateInoutCache(newData); return null; } @@ -291,8 +291,6 @@ this.delFromCache(param.getDeptId(), param.getType(), param.getId()); inoutMapper.toComplete(param); return null; @@ -370,8 +368,8 @@ } else { setInoutCache(data.getDeptId(), data); } //推送大屏 notifyToScreen(data.getCompanyId(), data.getDeptId(), data.getProgress()); } @@ -492,7 +490,7 @@ public String addInoutDataByLossOver(InoutData data) { // 获取上一车的流水数据 // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId()); // InoutData inoutData = this.getLastRecord(data.getCompanyId(), data.getDepotId()); // // 设置流水的库存 // if (InoutConstant.TYPE_IN.equals(inoutData.getType())) { @@ -754,27 +752,22 @@ } @Override public String updateCheckData(InoutCheckData data) { if (StringUtils.isEmpty(data.getCompanyId())) { data.setCompanyId(ContextUtil.getCompanyId()); } if (StringUtils.isEmpty(data.getDeptId())) { data.setCompanyId(ContextUtil.subDeptId(null)); } public String updateCheckData(InoutData data) { data.setUpdateTime(new Date()); int num = inoutCheckMapper.updateCheckData(data); //更新缓存 updateInoutCache(data); return null; } @Override public List<InoutPrice> getPrice(InoutCheckParam param) { if(null == param.getStart()){ if (null == param.getStart()) { param.setStart(new Date()); } if(null == param.getEnd()){ if (null == param.getEnd()) { param.setEnd(new Date()); } return inoutCheckMapper.getPrice(param); igds-inout/src/main/resources/mapper/InoutCheckMapper.xml
@@ -101,8 +101,9 @@ </select> <!--更新化验信息--> <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutCheckData"> UPDATE D_INOUT_RECORD SET <update id="updateCheckData" parameterType="com.ld.igds.inout.dto.InoutData"> UPDATE D_INOUT_RECORD SET TYPE_ = #{data.type}, <if test="data.depotId != null">DEPOT_ID_ = #{data.depotId},</if> <if test="data.checkUser != null">CHECK_USER_ = #{data.checkUser},</if> <if test="data.checkTime != null">CHECK_TIME_ = #{data.checkTime},</if> @@ -114,7 +115,6 @@ <if test="data.addCheck != null">ADD_CHECK_ = #{data.addCheck},</if> <if test="data.price != null">PRICE_ = #{data.price},</if> <if test="data.remarks != null">REMARKS_ = #{data.remarks},</if> TYPE_ = #{data.type} WHERE COMPANY_ID_ =#{data.companyId} AND ID_ =#{data.id} igds-web/src/main/resources/static/admin/inout/in-check.js
@@ -542,7 +542,7 @@ var index = layer.load(); $.ajax({ type: "POST", url: "../../basic/inout/update-check", url: "../../basic/inout/submit-check", dataType: "json", contentType: "application/json;charset=UTF-8", data: JSON.stringify(curCheckData), @@ -692,41 +692,6 @@ $("#form-param")[0].reset(); form.render(); } /** * 弹出提醒框 * @param msg 提醒信息 * @param data 数据信息，可能为空 */ function notify(msg, data) { if (data) { //赋值 $("#resultMsg").text(msg); $("#resultUserName").text(data.userName); $("#resultPlateNum").text(data.plateNum); if ("IN" == data.type) { $("#resultType").text("入库-" + INOUT_PROGRESS_MSG(data.progress)); } else { $("#resultType").text("出库-" + INOUT_PROGRESS_MSG(data.progress)); } $("#resultIntelCard").text(data.intelCard); layer.open({ type: 1, offset: ['150px', '200px'], area: '450px;', shade: 0.8, id: 'dialog_notify_info', btn: ['确定'], content: $('#dialog-from-notify'), yes: function (index) { layer.closeAll(); } }); } else { layer.alert(msg, {offset: ['300px', '300px']}); } }; // ---------------------------粮食产地 -开始 -------------------// // 弹出粮食产地下拉框
