diff --git a/src/main/java/com/huaheng/pc/general/company/domain/Company.java b/src/main/java/com/huaheng/pc/general/company/domain/Company.java
index fb3cc6a..0186943 100644
--- a/src/main/java/com/huaheng/pc/general/company/domain/Company.java
+++ b/src/main/java/com/huaheng/pc/general/company/domain/Company.java
@@ -4,12 +4,11 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import com.huaheng.framework.web.domain.BaseEntity;
-import lombok.Data;
-
@Data
@TableName(value = "company")
public class Company implements Serializable {
@@ -214,6 +213,7 @@ public class Company implements Serializable {
@TableField(value = "processStamp")
private String processStamp;
+ @TableField(exist = false)
private boolean flag = false;
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
new file mode 100644
index 0000000..9093cdd
--- /dev/null
+++ b/src/main/java/com/huaheng/pc/general/warehouse/controller/WareHouseController.java
@@ -0,0 +1,160 @@
+package com.huaheng.pc.general.warehouse.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaheng.common.support.Convert;
+import com.huaheng.common.utils.StringUtils;
+import com.huaheng.common.utils.security.ShiroUtils;
+import com.huaheng.framework.aspectj.lang.annotation.Log;
+import com.huaheng.framework.aspectj.lang.constant.BusinessType;
+import com.huaheng.framework.web.controller.BaseController;
+import com.huaheng.framework.web.domain.AjaxResult;
+import com.huaheng.framework.web.page.PageDomain;
+import com.huaheng.framework.web.page.TableDataInfo;
+import com.huaheng.framework.web.page.TableSupport;
+import com.huaheng.pc.general.company.service.CompanyService;
+import com.huaheng.pc.general.company.service.WarehouseService;
+import com.huaheng.pc.general.warehouse.domain.Warehouse;
+import com.huaheng.pc.inventory.inventoryHeader.domain.InventoryHeader;
+import com.huaheng.pc.inventory.inventoryHeader.service.InventoryHeaderService;
+import com.huaheng.pc.system.dict.service.IDictDataService;
+import com.huaheng.pc.system.dict.service.IDictTypeService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@RequestMapping("/general/warehouse")
+public class WareHouseController extends BaseController {
+
+ @Resource
+ private WarehouseService warehouseService;
+ @Resource
+ private InventoryHeaderService inventoryHeaderService;
+ @Resource
+ private IDictDataService dictDataService;
+ @Resource
+ private IDictTypeService dictTypeService;
+ @Resource
+ private CompanyService companyService;
+
+ private String prefix = "general/warehouse";
+
+ @RequiresPermissions("general:warehouse:view")
+ @GetMapping()
+ public String warehouse() {
+ return prefix + "/warehouse";
+ }
+
+ /**
+ * 查询仓库列表
+ */
+ @RequiresPermissions("general:warehouse:list")
+ @Log(title = "通用-仓库管理", operating = "查看仓库列表", action = BusinessType.GRANT)
+ @PostMapping("/list")
+ @ResponseBody
+ public TableDataInfo list(Warehouse warehouse, String createdBegin, String createdEnd) {
+ LambdaQueryWrapper<Warehouse> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ PageDomain pageDomain = TableSupport.buildPageRequest();
+ Integer pageNum = pageDomain.getPageNum();
+ Integer pageSize = pageDomain.getPageSize()/2;
+ lambdaQueryWrapper.gt(StringUtils.isNotEmpty(createdBegin),Warehouse::getCreated, createdBegin)
+ .lt(StringUtils.isNotEmpty(createdEnd),Warehouse::getCreated, createdEnd)
+ .eq(StringUtils.isNotEmpty(warehouse.getCode()),Warehouse::getCode, warehouse.getCode())
+ .eq(StringUtils.isNotEmpty(warehouse.getName()),Warehouse::getName,warehouse.getName())
+ .orderByDesc(Warehouse::getCreated);
+ /**
+ * 使用分页查询
+ */
+ if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
+ Page<Warehouse> page = new Page<>(pageNum, pageSize);
+ IPage<Warehouse> iPage = warehouseService.page(page, lambdaQueryWrapper);
+ return getDataTable(iPage.getRecords());
+ } else {
+ List<Warehouse> list = warehouseService.list(lambdaQueryWrapper);
+ return getDataTable(list);
+ }
+ }
+
+ /**
+ * 新增仓库
+ */
+ @GetMapping("/add")
+ public String add(ModelMap modelMap) {
+ modelMap.put("list",companyService.list());
+ return prefix + "/add";
+ }
+
+ /**
+ * 新增保存仓库
+ */
+ @RequiresPermissions("general:warehouse:add")
+ @Log(title = "通用-仓库管理", operating = "新增仓库", action = BusinessType.INSERT)
+ @PostMapping("/add")
+ @ResponseBody
+ public AjaxResult addSave(Warehouse warehouse) {
+ warehouse.setCreatedBy(ShiroUtils.getLoginName());
+ warehouse.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(warehouseService.save(warehouse));
+ }
+
+ /**
+ * 修改仓库
+ */
+ @GetMapping("/edit/{code}")
+ public String edit(@PathVariable("code") String code, ModelMap mmap) {
+ Warehouse warehouse = warehouseService.getById(code);
+ mmap.put("warehouse", warehouse);
+ mmap.put("list",companyService.list());
+ return prefix + "/edit";
+ }
+
+ /**
+ * 修改保存仓库
+ */
+ @RequiresPermissions("general:warehouse:edit")
+ @Log(title = "通用-仓库管理", operating = "修改仓库", action = BusinessType.UPDATE)
+ @PostMapping("/edit")
+ @ResponseBody
+ public AjaxResult editSave(Warehouse warehouse) {
+ warehouse.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(warehouseService.updateById(warehouse));
+ }
+
+ /**
+ * 删除仓库
+ */
+ @RequiresPermissions("general:warehouse:remove")
+ @Log(title = "通用-仓库管理", operating = "删除仓库", action = BusinessType.DELETE)
+ @PostMapping( "/remove")
+ @ResponseBody
+ public AjaxResult remove(String Codes) {
+ if (StringUtils.isEmpty(Codes))
+ return AjaxResult.error("id不能为空");
+ for (String code : Convert.toStrArray(Codes))
+ {
+ Warehouse warehouse = new Warehouse();
+ InventoryHeader inventory = new InventoryHeader();
+ inventory.setWarehouseCode(code);
+ inventory.setCompanyCode(warehouse.getCode());
+ LambdaQueryWrapper<InventoryHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
+ lambdaQueryWrapper.eq(InventoryHeader::getWarehouseCode,code);
+ int count = inventoryHeaderService.count(lambdaQueryWrapper);
+ if (count == 0) {
+ return AjaxResult.error("仓库编码(" + warehouse.getCode() +")还有库存，不能删除！");
+ }
+ warehouse.setLastUpdatedBy(ShiroUtils.getLoginName());
+ warehouse.setDeleted(true);
+ warehouseService.updateById(warehouse);
+ dictDataService.deleteDictDataByWarehouseCode(code);
+ dictTypeService.deleteDictTypeByWarehouseCode(code);
+ }
+ return AjaxResult.success("删除成功！");
+ }
+}
diff --git a/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java b/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java
index f8078e5..ab346da 100644
--- a/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java
+++ b/src/main/java/com/huaheng/pc/general/warehouse/domain/Warehouse.java
@@ -4,9 +4,10 @@ import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
import java.io.Serializable;
import java.util.Date;
-import lombok.Data;
@Data
@TableName(value = "warehouse")
@@ -14,7 +15,7 @@ public class Warehouse implements Serializable {
/**
* 仓库编码
*/
- @TableId(value = "code", type = IdType.INPUT)
+ @TableId(value = "code", type = IdType.INPUT)
private String code;
/**
@@ -185,6 +186,9 @@ public class Warehouse implements Serializable {
@TableField(value = "userDef8")
private String userDef8;
+ @TableField(value = "deleted")
+ private Boolean deleted;
+
private static final long serialVersionUID = 1L;
public static final String COL_ADDRESS1 = "address1";
@@ -242,4 +246,6 @@ public class Warehouse implements Serializable {
public static final String COL_USERDEF7 = "userDef7";
public static final String COL_USERDEF8 = "userDef8";
+
+ public static final String COL_DELETED = "deleted";
}
\ No newline at end of file
diff --git a/src/main/resources/mybatis/general/WarehouseMapper.xml b/src/main/resources/mybatis/general/WarehouseMapper.xml
index 779d001..1c94a4c 100644
--- a/src/main/resources/mybatis/general/WarehouseMapper.xml
+++ b/src/main/resources/mybatis/general/WarehouseMapper.xml
@@ -32,12 +32,13 @@
<result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
<result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
<result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
+ <result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
code, address1, address2, city, `state`, district, country, postalCode, attentionTo,
phoneNum, faxNum, email, hostCode, `name`, `enable`, orgCode, created, createdBy,
lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4, userDef5,
- userDef6, userDef7, userDef8
+ userDef6, userDef7, userDef8, delete
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/general/warehouse/add.html b/src/main/resources/templates/general/warehouse/add.html
index 5bdc426..c02b34a 100644
--- a/src/main/resources/templates/general/warehouse/add.html
+++ b/src/main/resources/templates/general/warehouse/add.html
@@ -18,9 +18,9 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">货主：</label>
+ <label class="col-sm-3 control-label">公司：</label>
<div class="col-sm-8">
- <select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}">
+ <select id="orgCode" name="orgCode" class="form-control">
<option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>
</select>
</div>
@@ -46,7 +46,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">省份：</label>
<div class="col-sm-8">
- <input id="province" name="province" class="form-control" type="text">
+ <input id="state" name="state" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@@ -74,13 +74,13 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">手机：</label>
+ <label class="col-sm-3 control-label">联系电话：</label>
<div class="col-sm-8">
<input id="phoneNum" name="phoneNum" class="form-control" type="text">
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">电话号码：</label>
+ <label class="col-sm-3 control-label">传真：</label>
<div class="col-sm-8">
<input id="faxNum" name="faxNum" class="form-control" type="text">
</div>
@@ -97,42 +97,7 @@
<input id="hostCode" name="hostCode" class="form-control" type="text">
</div>
</div>
- <div class="form-group">
- <label class="col-sm-3 control-label">创建时间：</label>
- <div class="col-sm-8">
- <input id="created" name="created" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">是否有效：</label>
- <div class="col-sm-8">
- <div class="onoffswitch">
- <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable">
- <label class="onoffswitch-label" for="enable">
- <span class="onoffswitch-inner"></span>
- <span class="onoffswitch-switch"></span>
- </label>
- </div>
- </div>
- </div>
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建用户：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="createdBy" name="createdBy" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">创建时间：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="lastUpdated" name="lastUpdated" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
- <!--<div class="form-group"> -->
- <!--<label class="col-sm-3 control-label">更新用户：</label>-->
- <!--<div class="col-sm-8">-->
- <!--<input id="lastUpdatedBy" name="lastUpdatedBy" class="form-control" type="text">-->
- <!--</div>-->
- <!--</div>-->
+
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">是否有效：</label>-->
<!--<div class="col-sm-8">-->
@@ -164,6 +129,20 @@
<!--</div>-->
<!--</div>-->
<div class="form-group">
+ <label class="col-sm-3 control-label">是否有效：</label>
+ <div class="col-sm-8">
+ <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
+ <div class="onoffswitch">
+ <!--<input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">-->
+ <input type="checkbox" class="onoffswitch-checkbox" id="enable" name="enable" readonly="true">
+ <label class="onoffswitch-label" for="enable">
+ <span class="onoffswitch-inner"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
<div class="form-control-static col-sm-offset-9">
<button type="submit" class="btn btn-primary">提交</button>
<button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
@@ -182,7 +161,7 @@
name:{
required:true
},
- companyId:{
+ orgCode:{
required:true,
digits:true
},
@@ -203,8 +182,8 @@
// $.operate.save(prefix + "/add", $('#form-warehouse-add').serialize());
var tableValue = $("#form-warehouse-add").serialize();
tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
- tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val());
- tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code"));
+ tableValue = formValueReplace(tableValue, "orgCode", $("#company option:selected").val());
+
$.operate.save(prefix + "/add", tableValue);
}
});
diff --git a/src/main/resources/templates/general/warehouse/edit.html b/src/main/resources/templates/general/warehouse/edit.html
index e2e717d..b24add9 100644
--- a/src/main/resources/templates/general/warehouse/edit.html
+++ b/src/main/resources/templates/general/warehouse/edit.html
@@ -4,100 +4,99 @@
<head th:include="include :: header"></head>
<body class="white-bg">
<div class="wrapper wrapper-content animated fadeInRight ibox-content">
- <form class="form-horizontal m" id="form-warehouse-edit" th:object="${warehouse}">
- <input id="id" name="id" th:field="*{id}" type="hidden">
- <div class="form-group">
- <label class="col-sm-3 control-label">编码：</label>
- <div class="col-sm-8">
- <input id="code" name="code" th:field="*{code}" class="form-control" type="text" readonly="true">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">名称：</label>
- <div class="col-sm-8">
- <input id="name" name="name" th:field="*{name}" class="form-control" type="text" readonly="true">
- </div>
- </div>
+ <form class="form-horizontal m" id="form-warehouse-edit" >
<div class="form-group">
- <label class="col-sm-3 control-label">货主：</label>
- <div class="col-sm-8">
- <select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}" th:field="*{companyId}">
- <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>
- </select>
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">地址1：</label>
- <div class="col-sm-8">
- <input id="address1" name="address1" th:field="*{address1}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">地址2：</label>
- <div class="col-sm-8">
- <input id="address2" name="address2" th:field="*{address2}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">城市：</label>
- <div class="col-sm-8">
- <input id="city" name="city" th:field="*{city}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">省份：</label>
- <div class="col-sm-8">
- <input id="province" name="province" th:field="*{province}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">区/县：</label>
- <div class="col-sm-8">
- <input id="district" name="district" th:field="*{district}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">国家：</label>
- <div class="col-sm-8">
- <input id="country" name="country" th:field="*{country}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">邮编：</label>
- <div class="col-sm-8">
- <input id="postalCode" name="postalCode" th:field="*{postalCode}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">联系人：</label>
- <div class="col-sm-8">
- <input id="attentionTo" name="attentionTo" th:field="*{attentionTo}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">手机：</label>
- <div class="col-sm-8">
- <input id="phoneNum" name="phoneNum" th:field="*{phoneNum}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">电话号码：</label>
- <div class="col-sm-8">
- <input id="faxNum" name="faxNum" th:field="*{faxNum}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">邮件地址：</label>
- <div class="col-sm-8">
- <input id="email" name="email" th:field="*{email}" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
- <label class="col-sm-3 control-label">上位系统url地址：</label>
- <div class="col-sm-8">
- <input id="hostCode" name="hostCode" th:field="*{hostCode}" class="form-control" type="text">
- </div>
- </div>
+ <label class="col-sm-3 control-label">仓库编码：</label>
+ <div class="col-sm-8">
+ <input id="code" name="code" th:value="${warehouse.code}" class="form-control" type="text" readonly="true">
+ </div>
+ </div>
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">名称：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="name" name="name" th:field="*{name}" class="form-control" type="text" readonly="true">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group">-->
+<!-- <label class="col-sm-3 control-label">公司：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <select id="orgCode" name="orgCode" class="form-control" th:field="*{orgCode}">-->
+<!-- <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>-->
+<!-- </select>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">地址1：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="address1" name="address1" th:field="*{address1}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">地址2：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="address2" name="address2" th:field="*{address2}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">城市：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="city" name="city" th:field="*{city}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">省份：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="state" name="state" th:field="*{province}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">区/县：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="district" name="district" th:field="*{district}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">国家：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="country" name="country" th:field="*{country}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">邮编：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="postalCode" name="postalCode" th:field="*{postalCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">联系人：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="attentionTo" name="attentionTo" th:field="*{attentionTo}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">联系电话：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="phoneNum" name="phoneNum" th:field="*{phoneNum}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">传真：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="faxNum" name="faxNum" th:field="*{faxNum}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">邮件地址：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="email" name="email" th:field="*{email}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">上位系统url地址：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <input id="hostCode" name="hostCode" th:field="*{hostCode}" class="form-control" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">创建时间：</label>-->
<!--<div class="col-sm-8">-->
@@ -122,20 +121,20 @@
<!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">-->
<!--</div>-->
<!--</div>-->
- <div class="form-group">
- <label class="col-sm-3 control-label">是否有效：</label>
- <div class="col-sm-8">
- <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
- <div class="onoffswitch">
- <!--<input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">-->
- <input type="checkbox" th:checked="${warehouse.enable}" class="onoffswitch-checkbox" id="enable" name="enable" readonly="true">
- <label class="onoffswitch-label" for="enable">
- <span class="onoffswitch-inner"></span>
- <span class="onoffswitch-switch"></span>
- </label>
- </div>
- </div>
- </div>
+<!-- <div class="form-group"> -->
+<!-- <label class="col-sm-3 control-label">是否有效：</label>-->
+<!-- <div class="col-sm-8">-->
+<!-- <!–<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">–>-->
+<!-- <div class="onoffswitch">-->
+<!-- <!–<input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">–>-->
+<!-- <input type="checkbox" th:checked="${enable}" class="onoffswitch-checkbox" id="enable" name="enable" readonly="true">-->
+<!-- <label class="onoffswitch-label" for="enable">-->
+<!-- <span class="onoffswitch-inner"></span>-->
+<!-- <span class="onoffswitch-switch"></span>-->
+<!-- </label>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
<!--<div class="form-group"> -->
<!--<label class="col-sm-3 control-label">是否删除：</label>-->
<!--<div class="col-sm-8">-->
@@ -179,7 +178,7 @@
name:{
required:true
},
- companyId:{
+ orgCode:{
required:true,
digits:true
},
@@ -200,8 +199,7 @@
// var tableValue = $.common.getTableValue("#form-warehouse-edit");
var tableValue = $("#form-warehouse-edit").serialize();
tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
- tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val());
- tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code"));
+ tableValue = formValueReplace(tableValue, "orgCode", $("#company option:selected").val());
$.operate.save(prefix + "/edit", tableValue);
}
});
diff --git a/src/main/resources/templates/general/warehouse/warehouse.html b/src/main/resources/templates/general/warehouse/warehouse.html
index 6da61d4..1a1b4f4 100644
--- a/src/main/resources/templates/general/warehouse/warehouse.html
+++ b/src/main/resources/templates/general/warehouse/warehouse.html
@@ -23,9 +23,9 @@
<!--</li>-->
<li class="time">
<label>创建时间： </label>
- <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[createdBegin]"/>
+ <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="createdBegin"/>
<span>-</span>
- <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="params[createdEnd]"/>
+ <input type="text" class="time-input" id="endTime" placeholder="结束时间" name="createdEnd"/>
</li>
<li>
<a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
@@ -40,9 +40,9 @@
<a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="general:warehouse:add">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="general:warehouse:remove">
+ <!--<a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="general:warehouse:remove">
<i class="fa fa-trash-o"></i> 删除
- </a>
+ </a>-->
</div>
<div class="col-sm-12 select-info">
@@ -54,26 +54,20 @@
<script th:inline="javascript">
var editFlag = [[${@permission.hasPermi('general:warehouse:edit')}]];
var removeFlag = [[${@permission.hasPermi('general:warehouse:remove')}]];
- var prefix = ctx + "general/warehouse"
+ var prefix = ctx + "general/warehouse";
var datas = [[${@dict.getType('sys_normal_disable')}]];
$(function() {
var options = {
url: prefix + "/list",
createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{id}",
+ updateUrl: prefix + "/edit/{code}",
removeUrl: prefix + "/remove",
modalName: "仓库",
search: false,
- sortName: "id",
- sortOrder: "desc",
columns: [{
checkbox: true
},
{
- field : 'id',
- title : '仓库id'
- },
- {
field : 'code',
title : '仓库编码'
},
@@ -82,8 +76,8 @@
title : '名称'
},
{
- field : 'companyId',
- title : '公司id'
+ field : 'orgCode',
+ title : '公司编码'
},
{
field : 'address1',
@@ -99,7 +93,7 @@
title : '城市'
},
{
- field : 'province',
+ field : 'state',
title : '省份' ,
visible:false
},
@@ -184,13 +178,43 @@
title : '自定义字段3',
visible:false
},
+ {
+ field : 'userDef4',
+ title : '自定义字段4',
+ visible:false
+ },
+ {
+ field : 'userDef5',
+ title : '自定义字段5',
+ visible:false
+ },
+ {
+ field : 'userDef6',
+ title : '自定义字段7',
+ visible:false
+ },
+ {
+ field : 'userDef7',
+ title : '自定义字段7',
+ visible:false
+ },
+ {
+ field : 'userDef8',
+ title : '自定义字段8',
+ visible:false
+ },
+ {
+ field : 'version',
+ title : '数据版本',
+ visible:false
+ },
{
title: '操作',
align: 'center',
formatter: function(value, row, index) {
var actions = [];
- actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
- actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-trash-o"></i>删除</a>');
+ actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="#" onclick="$.operate.edit(\'' + row.code + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+ actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="#" onclick="$.operate.remove(\'' + row.code + '\')"><i class="fa fa-trash-o"></i>删除</a>');
return actions.join('');
}
}]