zy-asrs.git - Gitblit

parent: 49a12fe4 | 补丁 | 提交 | ignore whitespace

zhang

14 小时以前 fc06a66b6ec47ae489f1cba3340b273054093c37

添加修改按钮

5个文件已修改

	src/main/java/com/zy/asrs/controller/PlaController.java	49 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/static/js/pla/plaDetl.js	27 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pla/plaDetl.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pla2/plaDetl.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/webapp/views/pla3/plaDetl.html	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 src/main/java/com/zy/asrs/controller/PlaController.java

@@ -20,8 +20,10 @@
import com.zy.common.CodeRes;
import com.zy.common.entity.PlaExcel;
import com.zy.common.web.BaseController;
import com.zy.system.entity.Config;
import com.zy.system.entity.OperateLog;
import com.zy.system.service.OperateLogService;
import com.zy.system.service.impl.ConfigServiceImpl;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -60,6 +62,8 @@

    @Resource
    private OperateLogService operateLogService;
    @Autowired
    private ConfigServiceImpl configService;

    // 获取下拉选择框值列表
    @GetMapping(value = "/pla/dropdownValues/list")
@@ -133,6 +137,47 @@
    @RequestMapping(value = "/pla/update/auth")
    @ManagerAuth
    public R update(@RequestBody List<Pla> plas) {
        Date date = new Date();
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "pla_status"));
        String value;
        if (config != null && config.getStatus() == 1) {
            value = config.getValue();
        } else {
            value = "";
        }
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
            String status = plaSave.getStatus();
            if (status != null && !Cools.isEmpty(value) && value.indexOf(status) == -1) {
                throw new CoolException("修改" + plaSave.getBatch() + "批号权限不足，请联系管理员进行修改");
            }
            pla.setModifyTime(new Date());
            plaService.updateById(pla);

            PlaLog plaLog = new PlaLog();
            BeanUtils.copyProperties(plaSave, plaLog);
            plaLog.setId(null);
            plaLog.setCreateTime(date);
            plaLog.setModifyUser(getUser().getUsername());
            plaLogService.insert(plaLog);

            // 记录操作日志
            OperateLog operateLog = new OperateLog();
            operateLog.setAction("聚乳酸库存明细修改");
            operateLog.setUserId(getUserId());
            operateLog.setIp(request.getRemoteAddr());
            operateLog.setRequest(pla.toString());
            operateLog.setResponse(plaSave.toString());
            operateLog.setCreateTime(new Date());
            operateLogService.insert(operateLog);

        });
        return R.ok();
    }

    @RequestMapping(value = "/pla/updateByAdmin/auth")
    @ManagerAuth
    public R updateByAdmin(@RequestBody List<Pla> plas) {
        Date date = new Date();
        plas.forEach(pla -> {
            Pla plaSave = plaService.selectById(pla.getId());
@@ -220,13 +265,13 @@
            if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
                throw new CoolException("批号:" + pla.getBatch() + "，包号:" + pla.getPackageNo() + " 剩余可出库重量不足，请调整出库重量");
            }
            if (Cools.isEmpty(pla.getMassState())){
            if (Cools.isEmpty(pla.getMassState())) {
                throw new CoolException("质量指标为上传");
            }
            pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
            pla.setHandlerBy(getUser().getUsername());
            pla.setStatus(GlobleParameter.PLA_STATUS_2);
            log.info("修改为待出库，地址：{},数据:{}","/pla/sellout/auth", pla);
            log.info("修改为待出库，地址：{},数据:{}", "/pla/sellout/auth", pla);
            pla.setModifyTime(new Date());
            pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
            //生成此次作业信息

 src/main/webapp/static/js/pla/plaDetl.js

@@ -387,6 +387,33 @@
                    });
                }
                break;
            case 'updateDataByAdmin':
                var data = checkStatus.data;
                if (data.length === 0){
                    layer.msg('请选择数据');
                } else {
                    layer.confirm('确定修改'+(data.length===1?'此':data.length)+'条数据吗', function(){
                        $.ajax({
                            url: baseUrl+"/pla/updateByAdmin/auth",
                            headers: {'token': localStorage.getItem('token')},
                            data: JSON.stringify(data),
                            contentType:'application/json;charset=UTF-8',
                            method: 'POST',
                            traditional:true,
                            success: function (res) {
                                if (res.code === 200){
                                    layer.closeAll();
                                    tableReload(false);
                                } else if (res.code === 403){
                                    top.location.href = baseUrl+"/";
                                } else {
                                    layer.msg(res.msg)
                                }
                            }
                        })
                    });
                }
                break;
            case "deleteData":
                var data = checkStatus.data;
                if (data.length === 0){

 src/main/webapp/views/pla/plaDetl.html

@@ -346,6 +346,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">删除</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">管理员修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">校验</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">冻结</button>
        <button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">解冻</button>
@@ -396,7 +397,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>

<!-- 打印操作弹窗 -->

 src/main/webapp/views/pla2/plaDetl.html

@@ -328,6 +328,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">删除</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">管理员修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">校验</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">冻结</button>
        <button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">解冻</button>
@@ -378,7 +379,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=1" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>

<!-- 打印操作弹窗 -->

 src/main/webapp/views/pla3/plaDetl.html

@@ -328,6 +328,7 @@
    <div class="layui-btn-container">
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">删除</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">管理员修改</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">校验</button>
        <button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">冻结</button>
        <button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">解冻</button>
@@ -378,7 +379,7 @@
<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>

<!-- 打印操作弹窗 -->

			@@ -20,8 +20,10 @@
			import com.zy.common.CodeRes;
			import com.zy.common.entity.PlaExcel;
			import com.zy.common.web.BaseController;
			import com.zy.system.entity.Config;
			import com.zy.system.entity.OperateLog;
			import com.zy.system.service.OperateLogService;
			import com.zy.system.service.impl.ConfigServiceImpl;
			import lombok.Synchronized;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			@@ -60,6 +62,8 @@

			@Resource
			private OperateLogService operateLogService;
			@Autowired
			private ConfigServiceImpl configService;

			// 获取下拉选择框值列表
			@GetMapping(value = "/pla/dropdownValues/list")
			@@ -133,6 +137,47 @@
			@RequestMapping(value = "/pla/update/auth")
			@ManagerAuth
			public R update(@RequestBody List<Pla> plas) {
			Date date = new Date();
			Config config = configService.selectOne(new EntityWrapper<Config>().eq("code", "pla_status"));
			String value;
			if (config != null && config.getStatus() == 1) {
			value = config.getValue();
			} else {
			value = "";
			}
			plas.forEach(pla -> {
			Pla plaSave = plaService.selectById(pla.getId());
			String status = plaSave.getStatus();
			if (status != null && !Cools.isEmpty(value) && value.indexOf(status) == -1) {
			throw new CoolException("修改" + plaSave.getBatch() + "批号权限不足，请联系管理员进行修改");
			}
			pla.setModifyTime(new Date());
			plaService.updateById(pla);

			PlaLog plaLog = new PlaLog();
			BeanUtils.copyProperties(plaSave, plaLog);
			plaLog.setId(null);
			plaLog.setCreateTime(date);
			plaLog.setModifyUser(getUser().getUsername());
			plaLogService.insert(plaLog);

			// 记录操作日志
			OperateLog operateLog = new OperateLog();
			operateLog.setAction("聚乳酸库存明细修改");
			operateLog.setUserId(getUserId());
			operateLog.setIp(request.getRemoteAddr());
			operateLog.setRequest(pla.toString());
			operateLog.setResponse(plaSave.toString());
			operateLog.setCreateTime(new Date());
			operateLogService.insert(operateLog);

			});
			return R.ok();
			}

			@RequestMapping(value = "/pla/updateByAdmin/auth")
			@ManagerAuth
			public R updateByAdmin(@RequestBody List<Pla> plas) {
			Date date = new Date();
			plas.forEach(pla -> {
			Pla plaSave = plaService.selectById(pla.getId());
			@@ -220,13 +265,13 @@
			if (pla.getWeightAnfme() - pla.getQtyAnfme() - pla.getOrderWeight() < 0) {
			throw new CoolException("批号:" + pla.getBatch() + "，包号:" + pla.getPackageNo() + " 剩余可出库重量不足，请调整出库重量");
			}
			if (Cools.isEmpty(pla.getMassState())){
			if (Cools.isEmpty(pla.getMassState())) {
			throw new CoolException("质量指标为上传");
			}
			pla.setQtyAnfme(pla.getQtyAnfme() + pla.getOrderWeight());
			pla.setHandlerBy(getUser().getUsername());
			pla.setStatus(GlobleParameter.PLA_STATUS_2);
			log.info("修改为待出库，地址：{},数据:{}","/pla/sellout/auth", pla);
			log.info("修改为待出库，地址：{},数据:{}", "/pla/sellout/auth", pla);
			pla.setModifyTime(new Date());
			pla.setPakoutTime(pla.getPakoutTime().split("\\(")[0]);
			//生成此次作业信息

			@@ -387,6 +387,33 @@
			});
			}
			break;
			case 'updateDataByAdmin':
			var data = checkStatus.data;
			if (data.length === 0){
			layer.msg('请选择数据');
			} else {
			layer.confirm('确定修改'+(data.length===1?'此':data.length)+'条数据吗', function(){
			$.ajax({
			url: baseUrl+"/pla/updateByAdmin/auth",
			headers: {'token': localStorage.getItem('token')},
			data: JSON.stringify(data),
			contentType:'application/json;charset=UTF-8',
			method: 'POST',
			traditional:true,
			success: function (res) {
			if (res.code === 200){
			layer.closeAll();
			tableReload(false);
			} else if (res.code === 403){
			top.location.href = baseUrl+"/";
			} else {
			layer.msg(res.msg)
			}
			}
			})
			});
			}
			break;
			case "deleteData":
			var data = checkStatus.data;
			if (data.length === 0){

			@@ -346,6 +346,7 @@
			<div class="layui-btn-container">
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">删除</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">修改</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">管理员修改</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">校验</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">冻结</button>
			<button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">解冻</button>
			@@ -396,7 +397,7 @@
			<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
			<script type="text/javascript" src="../../static/js/pla/plaDetl.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>

			<!-- 打印操作弹窗 -->

			@@ -328,6 +328,7 @@
			<div class="layui-btn-container">
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData" style="display: none">删除</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-update" lay-event="updateData" style="display: none">修改</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-updateByAdmin" lay-event="updateDataByAdmin" style="display: none">管理员修改</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-viladate" lay-event="viladate" style="display: none">校验</button>
			<button class="layui-btn layui-btn-sm layui-btn-danger " id="btn-freeze" lay-event="freezeData" style="display: none">冻结</button>
			<button class="layui-btn layui-btn-sm layui-btn-checked " id="btn-disfreeze" lay-event="disFreezeData" style="display: none">解冻</button>
			@@ -378,7 +379,7 @@
			<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
			<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=1" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/pla/plaDetl.js?v=2" charset="utf-8"></script>
			<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>

			<!-- 打印操作弹窗 -->