0f81c1982fdab3fdf172e5d42a9fd73f846071ea..51b59b6534012af93c35bcb9c95086b64f5dfe7e
2022-09-12 mrzhssss
Merge remote-tracking branch 'origin/zypms' into zypms
51b59b 对比 | 目录
2022-09-12 mrzhssss
##
f43258 对比 | 目录
3个文件已修改
37 ■■■■■ 已修改文件
src/main/java/zy/cloud/wms/manager/controller/ItemController.java 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/application.yml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/item/item.html 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/zy/cloud/wms/manager/controller/ItemController.java
@@ -19,6 +19,7 @@
import zy.cloud.wms.manager.service.*;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.util.*;
@RestController
@@ -129,9 +130,9 @@
        if (!Cools.isEmpty(name)) {
            throw new CoolException("不可有重复项目名");
        }
        if (item.getRealMonth() < 0){
            throw new CoolException("实施周期不可为负数");
        }
//        if (item.getRealMonth() < 0){
//            throw new CoolException("实施周期不可为负数");
//        }
        if (Cools.isEmpty(item.getCstmrUuid())) {
            throw new CoolException("请选择客户");
        }
@@ -153,6 +154,8 @@
        item.setStatus(1);
        item.setUpdateBy(getUserId());
        item.setUpdateTime(new Date());
        Long span = (item.getEndTime().getTime() - item.getStartTime().getTime()) / 1000 / 60 / 60 / 24;
        item.setRealMonth(Math.toIntExact(span));
        itemService.insertAll(item);
        return R.ok();
    }
src/main/resources/application.yml
@@ -10,9 +10,9 @@
    # sql-server
    driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
    #正式数据库
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms_pro
    #备份数据库
    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
#    url: jdbc:sqlserver://192.168.4.15:1433;databasename=zypms
    username: sa
    password: sa@123
  mvc:
src/main/webapp/views/item/item.html
@@ -186,15 +186,22 @@
                        <input class="layui-input" name="dutyMan" id="dutyMan$" placeholder="请输入责任人">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">实施周期(天): </label>
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="填写数字天数" type="number" lay-verify="required"
                               onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                               onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"
                               oninput="if(value>200)value=200;if(value<=0)value=1">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">实施周期(天): </label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input class="layui-input" name="realMonth" id="realMonth$" placeholder="填写数字天数" type="number" lay-verify="required"-->
<!--                               onkeyup="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
<!--                               onafterpaste="if(this.value.length==1){this.value=this.value.replace(/[^1-9]/g,'')}else{this.value=this.value.replace(/\D/g,'')}"-->
<!--                               oninput="if(value>200)value=200;if(value<=0)value=1">-->
<!--                    </div>-->
<!--                </div>-->
            </div>
            <div class="layui-col-md6">
@@ -299,12 +306,7 @@
<!--                        <input class="layui-input" name="createTime" id="createTime$" placeholder="请输入添加时间">-->
<!--                    </div>-->
<!--                </div>-->
                <div class="layui-form-item">
                    <label class="layui-form-label">备注: </label>
                    <div class="layui-input-block">
                        <input class="layui-input" name="memo" placeholder="请输入备注">
                    </div>
                </div>
             </div>
        </div>
        <hr class="layui-bg-gray">