diff --git a/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java b/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
index afc8264..5af1815 100644
--- a/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
+++ b/src/main/java/com/huaheng/pc/config/alarmLevel/controller/AlarmLevelController.java
@@ -41,7 +41,7 @@ public class AlarmLevelController extends BaseController {
private String prefix = "config/alarmLevel";
- @RequiresPermissions("config:containerCapacity:view")
+ @RequiresPermissions("config:alarmLevel:view")
@GetMapping()
public String containerCapacity()
{
@@ -125,7 +125,7 @@ public class AlarmLevelController extends BaseController {
* 修改保存预警等级
*/
@ApiOperation(value="修改预警等级信息", notes="修改预警等级信息", httpMethod = "POST")
- @RequiresPermissions("config:warehouse:edit")
+ @RequiresPermissions("config:alarmLevel:edit")
@Log(title = "配置-预警等级 ",operating = "修改预警等级 ", action = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
@@ -138,7 +138,7 @@ public class AlarmLevelController extends BaseController {
* 删除预警等级
*/
@ApiOperation(value="删除预警等级 ", notes="单条删除或批量删除预警等级 ，示例1或1,2,3", httpMethod = "POST")
- @RequiresPermissions("config:receiptType:remove")
+ @RequiresPermissions("config:alarmLevel:remove")
@Log(title = "配置-预警等级 ",operating = "删除预警等级 ", action = BusinessType.DELETE)
@PostMapping( "/remove")
@ResponseBody
diff --git a/src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java b/src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java
index cdbdeee..1e43202 100644
--- a/src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java
+++ b/src/main/java/com/huaheng/pc/config/receiptPreference/controller/ReceiptPreferenceController.java
@@ -64,9 +64,7 @@ public class ReceiptPreferenceController extends BaseController {
.eq(StringUtils.isNotEmpty(receiptPreference.getName()),
ReceiptPreference::getName, receiptPreference.getName())
.like(StringUtils.isNotEmpty(receiptPreference.getReceivingFlow()),
- ReceiptPreference::getReceivingFlow, receiptPreference.getReceivingFlow())
- .eq(StringUtils.isNotEmpty(receiptPreference.getReceiptTypes()),
- ReceiptPreference::getReceiptTypes, receiptPreference.getReceiptTypes());
+ ReceiptPreference::getReceivingFlow, receiptPreference.getReceivingFlow());
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
/*使用分页查询*/
diff --git a/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java b/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
index 551b42c..bfa6aae 100644
--- a/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
+++ b/src/main/java/com/huaheng/pc/config/receiptPreference/domain/ReceiptPreference.java
@@ -6,23 +6,29 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
import java.io.Serializable;
import java.util.Date;
+import lombok.Data;
-@ApiModel(value="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference",description="入库首选项")
-@TableName(value = "receipt_preference")
+@ApiModel(value="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference")
@Data
+@TableName(value = "receipt_preference")
public class ReceiptPreference implements Serializable {
/**
* ID
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
@ApiModelProperty(value="ID")
private Integer id;
/**
+ * 仓库
+ */
+ @TableField(value = "warehouseCode")
+ @ApiModelProperty(value="仓库")
+ private String warehouseCode;
+
+ /**
* 首选项代码
*/
@TableField(value = "code")
@@ -41,13 +47,6 @@ public class ReceiptPreference implements Serializable {
private String receivingFlow;
/**
- * 仓库
- */
- @TableField(value = "warehouseCode")
- @ApiModelProperty(value="仓库")
- private String warehouseCode;
-
- /**
* 自动生成托盘号
*/
@TableField(value = "autoAssignLPN")
@@ -83,13 +82,6 @@ public class ReceiptPreference implements Serializable {
private Integer showOpenQty;
/**
- * 入库单类型
- */
- @TableField(value = "receiptTypes")
- @ApiModelProperty(value="入库单类型")
- private String receiptTypes;
-
- /**
* RF组车收货
*/
@TableField(value = "groupPutaway")
@@ -104,11 +96,18 @@ public class ReceiptPreference implements Serializable {
private Integer manuallyBuildLPN;
/**
- * 定位规则动态指派
+ * 定位规则
+ */
+ @TableField(value = "locationRule")
+ @ApiModelProperty(value="定位规则")
+ private String locationRule;
+
+ /**
+ * 空库位规则
*/
- @TableField(value = "ruleAssignment")
- @ApiModelProperty(value="定位规则动态指派")
- private String ruleAssignment;
+ @TableField(value = "emptyLocRule")
+ @ApiModelProperty(value="空库位规则")
+ private String emptyLocRule;
/**
* RF逐件收货
@@ -125,6 +124,34 @@ public class ReceiptPreference implements Serializable {
private Integer pieceConfirm;
/**
+ * abc分类 0 否 1是
+ */
+ @TableField(value = "abcClass")
+ @ApiModelProperty(value="abc分类 0 否 1是")
+ private String abcClass;
+
+ /**
+ * 保质期（天）
+ */
+ @TableField(value = "daysToExpire")
+ @ApiModelProperty(value="保质期（天）")
+ private Integer daysToExpire;
+
+ /**
+ * 临期预警（天）
+ */
+ @TableField(value = "expiringDays")
+ @ApiModelProperty(value="临期预警（天）")
+ private Integer expiringDays;
+
+ /**
+ * 收货预警(天)
+ */
+ @TableField(value = "minShelfLifeDays")
+ @ApiModelProperty(value="收货预警(天)")
+ private Integer minShelfLifeDays;
+
+ /**
* RF快速上架
*/
@TableField(value = "allowQuickPutaway")
@@ -132,6 +159,13 @@ public class ReceiptPreference implements Serializable {
private Integer allowQuickPutaway;
/**
+ * 属性模板
+ */
+ @TableField(value = "attributeTemplateCode")
+ @ApiModelProperty(value="属性模板")
+ private String attributeTemplateCode;
+
+ /**
* 快速入库
*/
@TableField(value = "useQuickCheckIn")
@@ -236,4 +270,5 @@ public class ReceiptPreference implements Serializable {
@ApiModelProperty(value="处理标记")
private String processStamp;
+ private static final long serialVersionUID = 1L;
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java b/src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java
index 59075ce..348f181 100644
--- a/src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java
+++ b/src/main/java/com/huaheng/pc/config/receiptPreference/service/ReceiptPreferenceService.java
@@ -1,12 +1,12 @@
package com.huaheng.pc.config.receiptPreference.service;
-import com.baomidou.mybatisplus.extension.service.IService;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.huaheng.pc.config.receiptPreference.mapper.ReceiptPreferenceMapper;
import com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference;
-
@Service
-public class ReceiptPreferenceService extends ServiceImpl<ReceiptPreferenceMapper, ReceiptPreference> implements IService<ReceiptPreference> {
+public class ReceiptPreferenceService extends ServiceImpl<ReceiptPreferenceMapper, ReceiptPreference> {
}
diff --git a/src/main/java/com/huaheng/pc/config/warehouseConfig/domain/WarehouseConfig.java b/src/main/java/com/huaheng/pc/config/warehouseConfig/domain/WarehouseConfig.java
deleted file mode 100644
index b747f79..0000000
--- a/src/main/java/com/huaheng/pc/config/warehouseConfig/domain/WarehouseConfig.java
+++ /dev/null
@@ -1,242 +0,0 @@
-package com.huaheng.pc.config.warehouseConfig.domain;
-
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import java.io.Serializable;
-import java.util.Date;
-import lombok.Data;
-
-@ApiModel(value="com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig")
-@Data
-@TableName(value = "warehouse_config")
-public class WarehouseConfig implements Serializable {
- /**
- * 编码
- */
- @TableId(value = "code", type = IdType.INPUT)
- @ApiModelProperty(value="编码")
- private String code;
-
- /**
- * 仓库编码
- */
- @TableField(value = "warehouseCode")
- @ApiModelProperty(value="仓库编码")
- private String warehouseCode;
-
- /**
- * 名称
- */
- @TableField(value = "name")
- @ApiModelProperty(value="名称")
- private String name;
-
- /**
- * ABC分类
- */
- @TableField(value = "abcClass")
- @ApiModelProperty(value="ABC分类")
- private String abcClass;
-
- /**
- * 保质期（天）
- */
- @TableField(value = "daysToExpire")
- @ApiModelProperty(value="保质期（天）")
- private Integer daysToExpire;
-
- /**
- * 定位规则
- */
- @TableField(value = "locatingRule")
- @ApiModelProperty(value="定位规则")
- private String locatingRule;
-
- /**
- * 分配规则
- */
- @TableField(value = "allocationRule")
- @ApiModelProperty(value="分配规则")
- private String allocationRule;
-
- /**
- * 补货规则
- */
- @TableField(value = "replenishmentRule")
- @ApiModelProperty(value="补货规则")
- private String replenishmentRule;
-
- /**
- * 空货位规则
- */
- @TableField(value = "emptyLocRule")
- @ApiModelProperty(value="空货位规则")
- private String emptyLocRule;
-
- /**
- * 入库流程
- */
- @TableField(value = "receivingFlow")
- @ApiModelProperty(value="入库流程")
- private String receivingFlow;
-
- /**
- * 出库流程
- */
- @TableField(value = "shippingFlow")
- @ApiModelProperty(value="出库流程")
- private String shippingFlow;
-
- /**
- * 属性模版
- */
- @TableField(value = "attributeTemplateCode")
- @ApiModelProperty(value="属性模版")
- private String attributeTemplateCode;
-
- /**
- * 记录序列号
- */
- @TableField(value = "trackSerialNum")
- @ApiModelProperty(value="记录序列号")
- private Integer trackSerialNum;
-
- /**
- * 自动生成序列号
- */
- @TableField(value = "autoGenSerialNum")
- @ApiModelProperty(value="自动生成序列号")
- private Integer autoGenSerialNum;
-
- /**
- * 自动生成序列号表达式
- */
- @TableField(value = "autoGenSerialNumFormat")
- @ApiModelProperty(value="自动生成序列号表达式")
- private String autoGenSerialNumFormat;
-
- /**
- * 序列号模版
- */
- @TableField(value = "snTemplateCode")
- @ApiModelProperty(value="序列号模版")
- private String snTemplateCode;
-
- /**
- * 临期预警天数
- */
- @TableField(value = "expiringDays")
- @ApiModelProperty(value="临期预警天数")
- private Integer expiringDays;
-
- /**
- * 收货预警天数
- */
- @TableField(value = "minShelfLifeDays")
- @ApiModelProperty(value="收货预警天数")
- private Integer minShelfLifeDays;
-
- /**
- * 状态
- */
- @TableField(value = "enable")
- @ApiModelProperty(value="状态")
- private Integer enable;
-
- /**
- * 创建时间
- */
- @TableField(value = "created")
- @ApiModelProperty(value="创建时间")
- private Date created;
-
- /**
- * 创建用户
- */
- @TableField(value = "createdBy")
- @ApiModelProperty(value="创建用户")
- private String createdBy;
-
- /**
- * 创建时间
- */
- @TableField(value = "lastUpdated")
- @ApiModelProperty(value="创建时间")
- private Date lastUpdated;
-
- /**
- * 更新用户
- */
- @TableField(value = "lastUpdatedBy")
- @ApiModelProperty(value="更新用户")
- private String lastUpdatedBy;
-
- /**
- * 数据版本
- */
- @TableField(value = "version")
- @ApiModelProperty(value="数据版本")
- private Integer version;
-
- /**
- * 自定义字段1
- */
- @TableField(value = "userDef1")
- @ApiModelProperty(value="自定义字段1")
- private String userDef1;
-
- /**
- * 自定义字段2
- */
- @TableField(value = "userDef2")
- @ApiModelProperty(value="自定义字段2")
- private String userDef2;
-
- /**
- * 自定义字段3
- */
- @TableField(value = "userDef3")
- @ApiModelProperty(value="自定义字段3")
- private String userDef3;
-
- /**
- * 自定义字段4
- */
- @TableField(value = "userDef4")
- @ApiModelProperty(value="自定义字段4")
- private String userDef4;
-
- /**
- * 自定义字段5
- */
- @TableField(value = "userDef5")
- @ApiModelProperty(value="自定义字段5")
- private String userDef5;
-
- /**
- * 自定义字段6
- */
- @TableField(value = "userDef6")
- @ApiModelProperty(value="自定义字段6")
- private String userDef6;
-
- /**
- * 自定义字段7
- */
- @TableField(value = "userDef7")
- @ApiModelProperty(value="自定义字段7")
- private String userDef7;
-
- /**
- * 自定义字段8
- */
- @TableField(value = "userDef8")
- @ApiModelProperty(value="自定义字段8")
- private String userDef8;
-
- private static final long serialVersionUID = 1L;
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/warehouseConfig/mapper/WarehouseConfigMapper.java b/src/main/java/com/huaheng/pc/config/warehouseConfig/mapper/WarehouseConfigMapper.java
deleted file mode 100644
index 4203b5f..0000000
--- a/src/main/java/com/huaheng/pc/config/warehouseConfig/mapper/WarehouseConfigMapper.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.huaheng.pc.config.warehouseConfig.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
-
-public interface WarehouseConfigMapper extends BaseMapper<WarehouseConfig> {
-}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigService.java b/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigService.java
deleted file mode 100644
index bafdc34..0000000
--- a/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package com.huaheng.pc.config.warehouseConfig.service;
-
-import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
-import com.baomidou.mybatisplus.extension.service.IService;
-public interface WarehouseConfigService extends IService<WarehouseConfig>{
-
-
-}
diff --git a/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigServiceImpl.java b/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigServiceImpl.java
deleted file mode 100644
index 98c2a80..0000000
--- a/src/main/java/com/huaheng/pc/config/warehouseConfig/service/WarehouseConfigServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.huaheng.pc.config.warehouseConfig.service;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig;
-import com.huaheng.pc.config.warehouseConfig.mapper.WarehouseConfigMapper;
-import com.huaheng.pc.config.warehouseConfig.service.WarehouseConfigService;
-@Service
-public class WarehouseConfigServiceImpl extends ServiceImpl<WarehouseConfigMapper, WarehouseConfig> implements WarehouseConfigService{
-
-}
diff --git a/src/main/java/com/huaheng/pc/config/warehouseConfig/controller/WarehouseConfigController.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
index a2c8132..9386f35 100644
--- a/src/main/java/com/huaheng/pc/config/warehouseConfig/controller/WarehouseConfigController.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
@@ -1,4 +1,4 @@
-package com.huaheng.pc.config.warehouseConfig.controller;
+package com.huaheng.pc.receipt.receiptHeader.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -13,10 +13,12 @@ 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.config.warehouseConfig.domain.WarehouseConfig;
-import com.huaheng.pc.config.warehouseConfig.service.WarehouseConfigService;
+import com.huaheng.pc.config.alarmLevel.domain.AlarmLevel;
+import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
+import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
+import com.sun.org.apache.regexp.internal.RE;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
@@ -25,50 +27,58 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
+@Api(tags = "入库单")
@Controller
-@RequestMapping("/config/warehouseConfig")
-public class WarehouseConfigController extends BaseController {
+@RequestMapping("/receipt/receiptHeader")
+public class ReceiptHeaderController extends BaseController {
- private String prefix = "config/warehouseConfig";
+ private String prefix="receipt/receiptHeader";
@Resource
- private WarehouseConfigService warehouseConfigService;
+ private ReceiptHeaderService receiptHeaderService;
- @RequiresPermissions("config:warehouseConfig:view")
+ @RequiresPermissions("config:receiptHeader:view")
@GetMapping()
- public String receiptDetailHistory() {
- return prefix + "/warehouse";
+ public String containerCapacity()
+ {
+ return prefix + "/receiptHeader";
}
/**
- * 查询仓库配置
+ * 查询入库单
*/
- @ApiOperation(value="查看仓库配置", notes="根据编码获取仓库配置", httpMethod = "POST")
- @RequiresPermissions("config:warehouseConfig:list")
- @Log(title = "配置-仓库配置",operating = "仓库配置列表", action = BusinessType.GRANT)
+ @RequiresPermissions("config:receiptHeader:list")
+ @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
@PostMapping("/list")
@ResponseBody
- public TableDataInfo list(@ApiParam(name="WarehouseConfig",value="编码") WarehouseConfig warehouseConfig) {
- LambdaQueryWrapper<WarehouseConfig> lambda = Wrappers.lambdaQuery();
+ public TableDataInfo list(ReceiptHeader receiptHeader, String createdBegin, String createdEnd) {
+ LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
PageDomain pageDomain = TableSupport.buildPageRequest();
Integer pageNum = pageDomain.getPageNum();
Integer pageSize = pageDomain.getPageSize();
- lambda.eq(StringUtils.isNotEmpty(warehouseConfig.getWarehouseCode()), WarehouseConfig::getWarehouseCode
- , warehouseConfig.getWarehouseCode());
+
+ lambdaQueryWrapper.ge(StringUtils.isNotEmpty(createdBegin), ReceiptHeader::getCreated, createdBegin)
+ .le(StringUtils.isNotEmpty(createdEnd), ReceiptHeader::getCreated, createdEnd)
+ .in(ReceiptHeader::getCompanyCode, ShiroUtils.getCompanyCodeList())
+ .eq(ReceiptHeader::getWarehouseCode, ShiroUtils.getWarehouseCode())
+ .eq(StringUtils.isNotEmpty(receiptHeader.getReceiptType()),
+ ReceiptHeader::getReceiptType, receiptHeader.getReceiptType());
if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
- /*使用分页查询*/
- Page<WarehouseConfig> page = new Page<>(pageNum, pageSize);
- IPage<WarehouseConfig> iPage = warehouseConfigService.page(page, lambda);
- return getMpDataTable(iPage.getRecords(), iPage.getTotal());
+ /**
+ * 使用分页查询
+ */
+ Page<ReceiptHeader> page = new Page<>(pageNum, pageSize);
+ IPage<ReceiptHeader> iPage = receiptHeaderService.page(page, lambdaQueryWrapper);
+ return getMpDataTable(iPage.getRecords(),iPage.getTotal());
} else {
- List<WarehouseConfig> list = warehouseConfigService.list(lambda);
+ List<ReceiptHeader> list = receiptHeaderService.list(lambdaQueryWrapper);
return getDataTable(list);
}
}
/**
- * 新增仓库配置
+ * 新增入库单
*/
@GetMapping("/add")
public String add() {
@@ -76,45 +86,42 @@ public class WarehouseConfigController extends BaseController {
}
/**
- * 新增保存仓库配置
+ * 新增保存入库单
*/
- @ApiOperation(value="新增仓库配置", notes="新增仓库配置", httpMethod = "POST")
- @RequiresPermissions("config:warehouseConfig:add")
- @Log(title = "配置-仓库配置",operating = "新增仓库配置", action = BusinessType.INSERT)
+ @ApiOperation(value="新增入库单 ", notes="新增入库单 ", httpMethod = "POST")
+ @RequiresPermissions("config:receiptHeader:add")
+ @Log(title = "入库-入库单 ",operating = "新增入库单 ", action = BusinessType.INSERT)
@PostMapping("/add")
@ResponseBody
- public AjaxResult addSave(WarehouseConfig warehouseConfig) {
- LambdaQueryWrapper<WarehouseConfig> lambda = Wrappers.lambdaQuery();
- lambda.eq(WarehouseConfig::getWarehouseCode, warehouseConfig.getWarehouseCode());
- if (warehouseConfigService.getOne(lambda) != null){
- return AjaxResult.error("当前仓库已存在配置");
- }
- warehouseConfig.setCreatedBy(ShiroUtils.getLoginName());
- warehouseConfig.setLastUpdatedBy(ShiroUtils.getLoginName());
- return toAjax(warehouseConfigService.save(warehouseConfig));
+ public AjaxResult addSave(ReceiptHeader receiptHeader) {
+ receiptHeader.setWarehouseCode(ShiroUtils.getWarehouseCode());
+ receiptHeader.setFirstStatus(0);
+ receiptHeader.setLastStatus(0);
+ receiptHeader.setCreatedBy(ShiroUtils.getLoginName());
+ receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(receiptHeaderService.save(receiptHeader));
}
/**
- * 修改仓库配置
+ * 修改入库单
*/
@GetMapping("/edit/{id}")
public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
- WarehouseConfig warehouseConfig = warehouseConfigService.getById(id);
- mmap.put("warehouseConfig", warehouseConfig);
+ ReceiptHeader receiptHeader = receiptHeaderService.getById(id);
+ mmap.put("receiptHeader", receiptHeader);
return prefix + "/edit";
}
/**
- * 修改保存仓库配置
+ * 修改保存入库单
*/
- @ApiOperation(value="修改仓库配置信息", notes="修改仓库配置信息", httpMethod = "POST")
- @RequiresPermissions("config:warehouseConfig:edit")
- @Log(title = "配置-仓库配置",operating = "修改仓库配置", action = BusinessType.UPDATE)
+ @ApiOperation(value="修改入库单", notes="修改入库单", httpMethod = "POST")
+ @RequiresPermissions("config:receiptHeader:edit")
+ @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.UPDATE)
@PostMapping("/edit")
@ResponseBody
- public AjaxResult editSave(WarehouseConfig warehouseConfig) {
- warehouseConfig.setLastUpdatedBy(ShiroUtils.getLoginName());
- return toAjax(warehouseConfigService.updateById(warehouseConfig));
+ public AjaxResult editSave(ReceiptHeader receiptHeader) {
+ receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
+ return toAjax(receiptHeaderService.updateById(receiptHeader));
}
-
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
index aefbb02..40ace0a 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptHeader.java
@@ -4,329 +4,296 @@ 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 io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Date;
import lombok.Data;
-/**
- * 入库头表
- */
+@ApiModel(value="com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader")
@Data
@TableName(value = "receipt_header")
public class ReceiptHeader implements Serializable {
/**
* 入库单内部号
*/
- @TableId(value = "id", type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
+ @ApiModelProperty(value="入库单内部号")
private Integer id;
/**
* 仓库
*/
@TableField(value = "warehouseCode")
+ @ApiModelProperty(value="仓库")
private String warehouseCode;
/**
* 货主
*/
@TableField(value = "companyCode")
+ @ApiModelProperty(value="货主")
private String companyCode;
/**
* 入库单号
*/
@TableField(value = "code")
+ @ApiModelProperty(value="入库单号")
private String code;
/**
* 入库类型
*/
@TableField(value = "receiptType")
+ @ApiModelProperty(value="入库类型")
private String receiptType;
/**
* 首状态
*/
@TableField(value = "firstStatus")
+ @ApiModelProperty(value="首状态")
private Integer firstStatus;
/**
* 尾状态
*/
@TableField(value = "lastStatus")
+ @ApiModelProperty(value="尾状态")
private Integer lastStatus;
/**
* 关联单号
*/
@TableField(value = "referCode")
+ @ApiModelProperty(value="关联单号")
private String referCode;
/**
* 关联单号（内部号）
*/
@TableField(value = "referId")
+ @ApiModelProperty(value="关联单号（内部号）")
private Integer referId;
/**
* 关联订单类型
*/
@TableField(value = "referType")
+ @ApiModelProperty(value="关联订单类型")
private String referType;
/**
* 预计到达日期
*/
@TableField(value = "scheduledArriveDate")
+ @ApiModelProperty(value="预计到达日期")
private Date scheduledArriveDate;
/**
* 实际到达日期
*/
@TableField(value = "actualArriveDate")
+ @ApiModelProperty(value="实际到达日期")
private Date actualArriveDate;
/**
* 月台货位
*/
@TableField(value = "recvDock")
+ @ApiModelProperty(value="月台货位")
private String recvDock;
/**
* 关闭时间
*/
@TableField(value = "closedAt")
+ @ApiModelProperty(value="关闭时间")
private Date closedAt;
/**
* 强制关闭用户
*/
@TableField(value = "closedBy")
+ @ApiModelProperty(value="强制关闭用户")
private String closedBy;
/**
* 开始收货日期
*/
@TableField(value = "startCheckinDatetime")
+ @ApiModelProperty(value="开始收货日期")
private Date startCheckinDatetime;
/**
* 结束收货日期
*/
@TableField(value = "endCheckinDatetime")
+ @ApiModelProperty(value="结束收货日期")
private Date endCheckinDatetime;
/**
* 总数量
*/
@TableField(value = "totalQty")
+ @ApiModelProperty(value="总数量")
private Integer totalQty;
/**
* 总行数
*/
@TableField(value = "totalLines")
+ @ApiModelProperty(value="总行数")
private Integer totalLines;
/**
* 总箱数
*/
@TableField(value = "toalCases")
+ @ApiModelProperty(value="总箱数")
private Integer toalCases;
/**
* 总重量
*/
@TableField(value = "totalWeight")
+ @ApiModelProperty(value="总重量")
private BigDecimal totalWeight;
/**
* 总体积
*/
@TableField(value = "totalVolume")
+ @ApiModelProperty(value="总体积")
private BigDecimal totalVolume;
/**
* 入库单备注
*/
@TableField(value = "receiptNote")
+ @ApiModelProperty(value="入库单备注")
private String receiptNote;
/**
* 锁定
*/
@TableField(value = "locked")
+ @ApiModelProperty(value="锁定")
private Integer locked;
/**
* 锁定用户
*/
@TableField(value = "lockedBy")
+ @ApiModelProperty(value="锁定用户")
private String lockedBy;
/**
* 创建时间
*/
@TableField(value = "created")
+ @ApiModelProperty(value="创建时间")
private Date created;
/**
* 创建用户
*/
@TableField(value = "createdBy")
+ @ApiModelProperty(value="创建用户")
private String createdBy;
/**
* 创建时间
*/
@TableField(value = "lastUpdated")
+ @ApiModelProperty(value="创建时间")
private Date lastUpdated;
/**
* 更新用户
*/
@TableField(value = "lastUpdatedBy")
+ @ApiModelProperty(value="更新用户")
private String lastUpdatedBy;
/**
* 数据版本
*/
@TableField(value = "version")
+ @ApiModelProperty(value="数据版本")
private Integer version;
/**
* 自定义字段1
*/
@TableField(value = "userDef1")
+ @ApiModelProperty(value="自定义字段1")
private String userDef1;
/**
* 自定义字段2
*/
@TableField(value = "userDef2")
+ @ApiModelProperty(value="自定义字段2")
private String userDef2;
/**
* 自定义字段3
*/
@TableField(value = "userDef3")
+ @ApiModelProperty(value="自定义字段3")
private String userDef3;
/**
* 自定义字段4
*/
@TableField(value = "userDef4")
+ @ApiModelProperty(value="自定义字段4")
private String userDef4;
/**
* 自定义字段5
*/
@TableField(value = "userDef5")
+ @ApiModelProperty(value="自定义字段5")
private String userDef5;
/**
* 自定义字段6
*/
@TableField(value = "userDef6")
+ @ApiModelProperty(value="自定义字段6")
private String userDef6;
/**
* 自定义字段7
*/
@TableField(value = "userDef7")
+ @ApiModelProperty(value="自定义字段7")
private String userDef7;
/**
* 自定义字段8
*/
@TableField(value = "userDef8")
+ @ApiModelProperty(value="自定义字段8")
private String userDef8;
/**
* 处理标记
*/
@TableField(value = "processStamp")
+ @ApiModelProperty(value="处理标记")
private String processStamp;
+ /**
+ * 是否删除
+ */
@TableField(value = "deleted")
+ @ApiModelProperty(value="是否删除")
private Boolean deleted;
private static final long serialVersionUID = 1L;
-
- public static final String COL_WAREHOUSECODE = "warehouseCode";
-
- public static final String COL_COMPANYCODE = "companyCode";
-
- public static final String COL_CODE = "code";
-
- public static final String COL_RECEIPTTYPE = "receiptType";
-
- public static final String COL_FIRSTSTATUS = "firstStatus";
-
- public static final String COL_LASTSTATUS = "lastStatus";
-
- public static final String COL_REFERCODE = "referCode";
-
- public static final String COL_REFERID = "referId";
-
- public static final String COL_REFERTYPE = "referType";
-
- public static final String COL_SCHEDULEDARRIVEDATE = "scheduledArriveDate";
-
- public static final String COL_ACTUALARRIVEDATE = "actualArriveDate";
-
- public static final String COL_RECVDOCK = "recvDock";
-
- public static final String COL_CLOSEDAT = "closedAt";
-
- public static final String COL_CLOSEDBY = "closedBy";
-
- public static final String COL_STARTCHECKINDATETIME = "startCheckinDatetime";
-
- public static final String COL_ENDCHECKINDATETIME = "endCheckinDatetime";
-
- public static final String COL_TOTALQTY = "totalQty";
-
- public static final String COL_TOTALLINES = "totalLines";
-
- public static final String COL_TOALCASES = "toalCases";
-
- public static final String COL_TOTALWEIGHT = "totalWeight";
-
- public static final String COL_TOTALVOLUME = "totalVolume";
-
- public static final String COL_RECEIPTNOTE = "receiptNote";
-
- public static final String COL_LOCKED = "locked";
-
- public static final String COL_LOCKEDBY = "lockedBy";
-
- public static final String COL_CREATED = "created";
-
- public static final String COL_CREATEDBY = "createdBy";
-
- public static final String COL_LASTUPDATED = "lastUpdated";
-
- public static final String COL_LASTUPDATEDBY = "lastUpdatedBy";
-
- public static final String COL_VERSION = "version";
-
- public static final String COL_USERDEF1 = "userDef1";
-
- public static final String COL_USERDEF2 = "userDef2";
-
- public static final String COL_USERDEF3 = "userDef3";
-
- public static final String COL_USERDEF4 = "userDef4";
-
- public static final String COL_USERDEF5 = "userDef5";
-
- public static final String COL_USERDEF6 = "userDef6";
-
- public static final String COL_USERDEF7 = "userDef7";
-
- public static final String COL_USERDEF8 = "userDef8";
-
- public static final String COL_PROCESSSTAMP = "processStamp";
}
\ No newline at end of file
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptModel.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptModel.java
deleted file mode 100644
index 58a26d4..0000000
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/domain/ReceiptModel.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.huaheng.pc.receipt.receiptHeader.domain;
-
-import com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail;
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * 入库实体类
- */
-@Data
-public class ReceiptModel {
-
- private ReceiptHeader receiptHeader;
-
- private List<ReceiptDetail> receiptDetail;
-}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
index a3f990e..e365d36 100644
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
+++ b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderService.java
@@ -1,8 +1,12 @@
package com.huaheng.pc.receipt.receiptHeader.service;
+import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.List;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
-import com.baomidou.mybatisplus.extension.service.IService;
-public interface ReceiptHeaderService extends IService<ReceiptHeader>{
-
+@Service
+public class ReceiptHeaderService extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> {
}
diff --git a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderServiceImpl.java b/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderServiceImpl.java
deleted file mode 100644
index 1558db2..0000000
--- a/src/main/java/com/huaheng/pc/receipt/receiptHeader/service/ReceiptHeaderServiceImpl.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.huaheng.pc.receipt.receiptHeader.service;
-
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
-import java.util.List;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huaheng.pc.receipt.receiptHeader.mapper.ReceiptHeaderMapper;
-import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
-import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
-@Service
-public class ReceiptHeaderServiceImpl extends ServiceImpl<ReceiptHeaderMapper, ReceiptHeader> implements ReceiptHeaderService{
-
-}
diff --git a/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml b/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml
index eb1da3c..1cc74ca 100644
--- a/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml
+++ b/src/main/resources/mybatis/config/ReceiptPreferenceMapper.xml
@@ -4,22 +4,27 @@
<resultMap id="BaseResultMap" type="com.huaheng.pc.config.receiptPreference.domain.ReceiptPreference">
<!--@mbg.generated-->
<id column="id" jdbcType="INTEGER" property="id" />
+ <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
<result column="code" jdbcType="VARCHAR" property="code" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
- <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
<result column="autoAssignLPN" jdbcType="INTEGER" property="autoAssignLPN" />
<result column="allowOverReceiving" jdbcType="BIT" property="allowOverReceiving" />
<result column="allowOverReceivingQty" jdbcType="INTEGER" property="allowOverReceivingQty" />
<result column="autoLocate" jdbcType="INTEGER" property="autoLocate" />
<result column="showOpenQty" jdbcType="INTEGER" property="showOpenQty" />
- <result column="receiptTypes" jdbcType="VARCHAR" property="receiptTypes" />
<result column="groupPutaway" jdbcType="INTEGER" property="groupPutaway" />
<result column="manuallyBuildLPN" jdbcType="INTEGER" property="manuallyBuildLPN" />
- <result column="ruleAssignment" jdbcType="VARCHAR" property="ruleAssignment" />
+ <result column="locationRule" jdbcType="VARCHAR" property="locationRule" />
+ <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
<result column="checkinByPiece" jdbcType="INTEGER" property="checkinByPiece" />
<result column="pieceConfirm" jdbcType="INTEGER" property="pieceConfirm" />
+ <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
+ <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
+ <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
+ <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
<result column="allowQuickPutaway" jdbcType="INTEGER" property="allowQuickPutaway" />
+ <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
<result column="useQuickCheckIn" jdbcType="INTEGER" property="useQuickCheckIn" />
<result column="created" jdbcType="TIMESTAMP" property="created" />
<result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
@@ -38,10 +43,11 @@
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
- id, code, `name`, receivingFlow, warehouseCode, autoAssignLPN, allowOverReceiving,
- allowOverReceivingQty, autoLocate, showOpenQty, receiptTypes, groupPutaway, manuallyBuildLPN,
- ruleAssignment, checkinByPiece, pieceConfirm, allowQuickPutaway, useQuickCheckIn,
- created, createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3,
- userDef4, userDef5, userDef6, userDef7, userDef8, processStamp
+ id, warehouseCode, code, `name`, receivingFlow, autoAssignLPN, allowOverReceiving,
+ allowOverReceivingQty, autoLocate, showOpenQty, groupPutaway, manuallyBuildLPN, locationRule,
+ emptyLocRule, checkinByPiece, pieceConfirm, abcClass, daysToExpire, expiringDays,
+ minShelfLifeDays, allowQuickPutaway, attributeTemplateCode, useQuickCheckIn, created,
+ createdBy, lastUpdated, lastUpdatedBy, version, userDef1, userDef2, userDef3, userDef4,
+ userDef5, userDef6, userDef7, userDef8, processStamp
</sql>
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/config/WarehouseConfigMapper.xml b/src/main/resources/mybatis/config/WarehouseConfigMapper.xml
deleted file mode 100644
index 290bce4..0000000
--- a/src/main/resources/mybatis/config/WarehouseConfigMapper.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.config.warehouseConfig.mapper.WarehouseConfigMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.config.warehouseConfig.domain.WarehouseConfig">
- <!--@mbg.generated-->
- <id column="code" jdbcType="VARCHAR" property="code" />
- <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
- <result column="name" jdbcType="VARCHAR" property="name" />
- <result column="abcClass" jdbcType="VARCHAR" property="abcClass" />
- <result column="daysToExpire" jdbcType="INTEGER" property="daysToExpire" />
- <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
- <result column="allocationRule" jdbcType="VARCHAR" property="allocationRule" />
- <result column="replenishmentRule" jdbcType="VARCHAR" property="replenishmentRule" />
- <result column="emptyLocRule" jdbcType="VARCHAR" property="emptyLocRule" />
- <result column="receivingFlow" jdbcType="VARCHAR" property="receivingFlow" />
- <result column="shippingFlow" jdbcType="VARCHAR" property="shippingFlow" />
- <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
- <result column="trackSerialNum" jdbcType="INTEGER" property="trackSerialNum" />
- <result column="autoGenSerialNum" jdbcType="INTEGER" property="autoGenSerialNum" />
- <result column="autoGenSerialNumFormat" jdbcType="VARCHAR" property="autoGenSerialNumFormat" />
- <result column="snTemplateCode" jdbcType="VARCHAR" property="snTemplateCode" />
- <result column="expiringDays" jdbcType="INTEGER" property="expiringDays" />
- <result column="minShelfLifeDays" jdbcType="INTEGER" property="minShelfLifeDays" />
- <result column="enable" jdbcType="INTEGER" property="enable" />
- <result column="created" jdbcType="TIMESTAMP" property="created" />
- <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
- <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
- <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
- <result column="version" jdbcType="INTEGER" property="version" />
- <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
- <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
- <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
- <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- code, warehouseCode, `name`, abcClass, daysToExpire, locatingRule, allocationRule,
- replenishmentRule, emptyLocRule, receivingFlow, shippingFlow, attributeTemplateCode,
- trackSerialNum, autoGenSerialNum, autoGenSerialNumFormat, snTemplateCode, expiringDays,
- minShelfLifeDays, `enable`, created, createdBy, lastUpdated, lastUpdatedBy, version,
- userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8
- </sql>
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml b/src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml
deleted file mode 100644
index 2e23d3a..0000000
--- a/src/main/resources/mybatis/receipt/ReceiptDetailMapper.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.huaheng.pc.receipt.receiptDetail.mapper.ReceiptDetailMapper">
- <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptDetail.domain.ReceiptDetail">
- <!--@mbg.generated-->
- <id column="id" jdbcType="INTEGER" property="id" />
- <result column="receiptId" jdbcType="INTEGER" property="receiptId" />
- <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
- <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
- <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
- <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
- <result column="materialName" jdbcType="VARCHAR" property="materialName" />
- <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
- <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
- <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
- <result column="batch" jdbcType="VARCHAR" property="batch" />
- <result column="lot" jdbcType="VARCHAR" property="lot" />
- <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
- <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
- <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
- <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
- <result column="agingDate" jdbcType="DATE" property="agingDate" />
- <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
- <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
- <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
- <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
- <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
- <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
- <result column="openQty" jdbcType="INTEGER" property="openQty" />
- <result column="referCode" jdbcType="VARCHAR" property="referCode" />
- <result column="referId" jdbcType="INTEGER" property="referId" />
- <result column="referLineNum" jdbcType="VARCHAR" property="referLineNum" />
- <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
- <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
- <result column="itemListPrice" jdbcType="DECIMAL" property="itemListPrice" />
- <result column="itemNetPrice" jdbcType="DECIMAL" property="itemNetPrice" />
- <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
- <result column="created" jdbcType="TIMESTAMP" property="created" />
- <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
- <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
- <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
- <result column="version" jdbcType="INTEGER" property="version" />
- <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
- <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
- <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
- <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
- <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
- <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
- <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
- <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
- <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
- <result column="deleted" jdbcType="BIT" property="deleted" />
- </resultMap>
- <sql id="Base_Column_List">
- <!--@mbg.generated-->
- id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName,
- materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate,
- expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3,
- attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts,
- itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy,
- version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
- processStamp, deleted
- </sql>
-
-</mapper>
\ No newline at end of file
diff --git a/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml b/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
index b892680..7fdfbd5 100644
--- a/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
+++ b/src/main/resources/mybatis/receipt/ReceiptHeaderMapper.xml
@@ -42,6 +42,7 @@
<result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
<result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
<result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
+ <result column="deleted" jdbcType="BIT" property="deleted" />
</resultMap>
<sql id="Base_Column_List">
<!--@mbg.generated-->
@@ -50,8 +51,6 @@
startCheckinDatetime, endCheckinDatetime, totalQty, totalLines, toalCases, totalWeight,
totalVolume, receiptNote, locked, lockedBy, created, createdBy, lastUpdated, lastUpdatedBy,
version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
- processStamp
+ processStamp, deleted
</sql>
-
-
</mapper>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/receiptPreference/add.html b/src/main/resources/templates/config/receiptPreference/add.html
index 2c84572..d7b7a4e 100644
--- a/src/main/resources/templates/config/receiptPreference/add.html
+++ b/src/main/resources/templates/config/receiptPreference/add.html
@@ -60,12 +60,6 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">入库单类型：</label>
- <div class="col-sm-8">
- <input id="receiptTypes" name="receiptTypes" class="form-control" type="text">
- </div>
- </div>
- <div class="form-group">
<label class="col-sm-3 control-label">RF组车收货：</label>
<div class="col-sm-8">
<input id="groupPutaway" name="groupPutaway" class="form-control" type="text">
@@ -78,9 +72,15 @@
</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="locationRule" name="locationRule" 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="ruleAssignment" name="ruleAssignment" class="form-control" type="text">
+ <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text">
</div>
</div>
<div class="form-group">
@@ -96,12 +96,42 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">abc分类：</label>
+ <div class="col-sm-8">
+ <input id="abcClass" name="abcClass" 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="daysToExpire" name="daysToExpire" 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="expiringDays" name="expiringDays" 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="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text">
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">RF快速上架：</label>
<div class="col-sm-8">
<input id="allowQuickPutaway" name="allowQuickPutaway" 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="attributeTemplateCode" name="attributeTemplateCode" 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="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text">
diff --git a/src/main/resources/templates/config/receiptPreference/edit.html b/src/main/resources/templates/config/receiptPreference/edit.html
index 47281f6..712e423 100644
--- a/src/main/resources/templates/config/receiptPreference/edit.html
+++ b/src/main/resources/templates/config/receiptPreference/edit.html
@@ -3,9 +3,9 @@
<meta charset="utf-8">
<head th:include="include :: header"></head>
<body class="white-bg">
-<div class="wrapper wrapper-content animated fadeInRight ibox-content" th:object="${receiptPreference}">
- <form class="form-horizontal m" id="form-receiptPreference-edit">
- <input name="id" th:field="*{id}">
+<div class="wrapper wrapper-content animated fadeInRight ibox-content">
+ <form class="form-horizontal m" id="form-receiptPreference-edit" th:object="${receiptPreference}">
+ <input id="id" name="id" th:field="*{id}">
<div class="form-group">
<label class="col-sm-3 control-label">编码：</label>
<div class="col-sm-8">
@@ -34,8 +34,8 @@
<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="allowOverReceiving" name="allowOverReceiving" th:field="*{allowOverReceiving}">
+ <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="allowOverReceiving"
+ name="allowOverReceiving" th:field="*{allowOverReceiving}">
<label class="onoffswitch-label" for="allowOverReceiving">
<span class="onoffswitch-inner"></span>
<span class="onoffswitch-switch"></span>
@@ -46,8 +46,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">允许超收范围：</label>
<div class="col-sm-8">
- <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control"
- type="text" th:field="*{allowOverReceivingQty}">
+ <input id="allowOverReceivingQty" name="allowOverReceivingQty" class="form-control" type="text" th:field="*{allowOverReceivingQty}">
</div>
</div>
<div class="form-group">
@@ -63,12 +62,6 @@
</div>
</div>
<div class="form-group">
- <label class="col-sm-3 control-label">入库单类型：</label>
- <div class="col-sm-8">
- <input id="receiptTypes" name="receiptTypes" class="form-control" type="text" th:field="*{receiptTypes}">
- </div>
- </div>
- <div class="form-group">
<label class="col-sm-3 control-label">RF组车收货：</label>
<div class="col-sm-8">
<input id="groupPutaway" name="groupPutaway" class="form-control" type="text" th:field="*{groupPutaway}">
@@ -81,9 +74,15 @@
</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="locationRule" name="locationRule" class="form-control" type="text" th:field="*{locationRule}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">空库位规则：</label>
<div class="col-sm-8">
- <input id="ruleAssignment" name="ruleAssignment" class="form-control" type="text" th:field="*{ruleAssignment}">
+ <input id="emptyLocRule" name="emptyLocRule" class="form-control" type="text" th:field="*{emptyLocRule}">
</div>
</div>
<div class="form-group">
@@ -99,12 +98,42 @@
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">abc分类：</label>
+ <div class="col-sm-8">
+ <input id="abcClass" name="abcClass" class="form-control" type="text" th:field="*{abcClass}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">保质期（天）：</label>
+ <div class="col-sm-8">
+ <input id="daysToExpire" name="daysToExpire" class="form-control" type="text" th:field="*{daysToExpire}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">临期预警（天）：</label>
+ <div class="col-sm-8">
+ <input id="expiringDays" name="expiringDays" class="form-control" type="text" th:field="*{expiringDays}">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-sm-3 control-label">收货预警(天)：</label>
+ <div class="col-sm-8">
+ <input id="minShelfLifeDays" name="minShelfLifeDays" class="form-control" type="text" th:field="*{minShelfLifeDays}">
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">RF快速上架：</label>
<div class="col-sm-8">
<input id="allowQuickPutaway" name="allowQuickPutaway" class="form-control" type="text" th:field="*{allowQuickPutaway}">
</div>
</div>
<div class="form-group">
+ <label class="col-sm-3 control-label">属性模板：</label>
+ <div class="col-sm-8">
+ <input id="attributeTemplateCode" name="attributeTemplateCode" class="form-control" type="text" th:field="*{attributeTemplateCode}">
+ </div>
+ </div>
+ <div class="form-group">
<label class="col-sm-3 control-label">快速入库：</label>
<div class="col-sm-8">
<input id="useQuickCheckIn" name="useQuickCheckIn" class="form-control" type="text" th:field="*{useQuickCheckIn}">
@@ -240,9 +269,8 @@
}
},
submitHandler: function(form) {
- var tableValue = $.common.getTableValue("#form-receiptPreference-edit");
- tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
- tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
+ var tableValue = $.common.getTableValue("#form-receiptPreference-edi");
+ tableValue = formValueReplace(tableValue, "allowOverReceiving", $("input[name='allowOverReceiving']").is(':checked'));
$.operate.save(prefix + "/edit", tableValue);
}
});
diff --git a/src/main/resources/templates/config/receiptPreference/receiptPreference.html b/src/main/resources/templates/config/receiptPreference/receiptPreference.html
index 4bcbd32..f54ce20 100644
--- a/src/main/resources/templates/config/receiptPreference/receiptPreference.html
+++ b/src/main/resources/templates/config/receiptPreference/receiptPreference.html
@@ -36,10 +36,10 @@
</form>
</div>
<div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:locationType:add">
+ <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:receiptPreference:add">
<i class="fa fa-plus"></i> 新增
</a>
- <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:locationType:remove">
+ <a class="btn btn-outline btn-danger btn-rounded" onclick="$.operate.batRemove()" shiro:hasPermission="config:receiptPreference:remove">
<i class="fa fa-trash-o"></i> 删除
</a>
</div>
@@ -120,8 +120,12 @@
title : '人工组盘'
},
{
- field : 'ruleAssignment',
- title : '定位规则动态指派'
+ field : 'locationRule',
+ title : '定位规则'
+ },
+ {
+ field : 'emptyLocRule',
+ title : '空库位规则'
},
{
field : 'checkinByPiece',
@@ -132,10 +136,30 @@
title : 'RF自动提交收货'
},
{
+ field : 'abcClass',
+ title : 'abc分类'
+ },
+ {
+ field : 'daysToExpire',
+ title : '保质期(天)'
+ },
+ {
+ field : 'expiringDays',
+ title : '临期预警(天)'
+ },
+ {
+ field : 'minShelfLifeDays',
+ title : '收货预警(天)'
+ },
+ {
field : 'allowQuickPutaway',
title : 'RF快速上架'
},
{
+ field : 'attributeTemplateCode',
+ title : '属性模板'
+ },
+ {
field : 'useQuickCheckIn',
title : '快速入库'
},
@@ -208,5 +232,7 @@
$.table.init(options);
});
</script>
+ </div>
+</div>
</body>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/warehouseConfig/add.html b/src/main/resources/templates/config/warehouseConfig/add.html
deleted file mode 100644
index 566549b..0000000
--- a/src/main/resources/templates/config/warehouseConfig/add.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
- <meta charset="UTF-8">
- <title>Title</title>
-</head>
-<body>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/config/warehouseConfig/warehouse.html b/src/main/resources/templates/config/warehouseConfig/warehouse.html
deleted file mode 100644
index ad04a3a..0000000
--- a/src/main/resources/templates/config/warehouseConfig/warehouse.html
+++ /dev/null
@@ -1,219 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
-<meta charset="utf-8">
-<head th:include="include :: header"></head>
-<body class="gray-bg">
-<div class="container-div">
- <div class="row">
- <div class="col-sm-12 select-info">
- <form id="company-form">
- <div class="select-list">
- <ul>
- <li>
- 仓库编码：<input type="text" name="code"/>
- </li>
- <li>
- <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i> 搜索</a>
- </li>
- </ul>
- </div>
- </form>
- </div>
- <div class="btn-group hidden-xs" id="toolbar" role="group">
- <a class="btn btn-outline btn-success btn-rounded" onclick="$.operate.add()" shiro:hasPermission="config:warehouse:add">
- <i class="fa fa-plus"></i> 新增
- </a>
- </div>
-
- <div class="col-sm-12 select-info">
- <table id="bootstrap-table" data-mobile-responsive="true" class="table table-bordered table-hover"></table>
- </div>
- </div>
-</div>
-<div th:include="include :: footer"></div>
-<script th:inline="javascript">
- var editFlag = [[${@permission.hasPermi('config:warehouseConfig:edit')}]];
- var removeFlag = [[${@permission.hasPermi('config:warehouseConfig:remove')}]];
- var prefix = ctx + "config/warehouseConfig";
- var datas = [[${@dict.getType('sys_normal_disable')}]];
- $(function() {
- var options = {
- url: prefix + "/list",
- createUrl: prefix + "/add",
- updateUrl: prefix + "/edit/{code}",
- removeUrl: prefix + "/remove",
- modalName: "仓库配置",
- search: false,
- columns: [{
- checkbox: true
- },
- {
- field : 'code',
- title : '编码',
- visible : false
- },
- {
- field : 'warehouseCode',
- title : '仓库编码'
- },
- {
- field : 'name',
- title : '名称'
- },
- {
- field : 'abcClass',
- title : 'ABC分类'
- },
- {
- field : 'daysToExpire',
- title : '保质期(天)'
- },
- {
- field : 'locatingRule',
- title : '定位规则'
- },
- {
- field : 'allocationRule',
- title : '分配规则' ,
- },
- {
- field : 'replenishmentRule',
- title : '补货规则'
- },
- {
- field : 'emptyLocRule',
- title : '空货位规则'
- },
- {
- field : 'receivingFlow',
- title : '入库流程'
- },
- {
- field : 'shippingFlow',
- title : '出库流程'
- },
- {
- field : 'attributeTemplateCode',
- title : '属性模版'
- },
- {
- field : 'trackSerialNum',
- title : '记录序列号'
- },
- {
- field : 'autoGenSerialNum',
- title : '自动生成序列号'
- },
- {
- field : 'autoGenSerialNumFormat',
- title : '自动生成序列号表达式'
- },
- {
- field : 'snTemplateCode',
- title : '序列号模版'
- },
- {
- field : 'expiringDays',
- title : '临期预警天数'
- },
- {
- field : 'minShelfLifeDays',
- title : '收货预警天数'
- },
- {
- field : 'created',
- title : '创建时间',
- visible : false
- },
- {
- field : 'createdBy',
- title : '创建用户',
- visible : false
- },
- {
- field : 'lastUpdated',
- title : '更新时间',
- visible : false
- },
- {
- field : 'lastUpdatedBy',
- title : '更新用户',
- visible : false
- },
- {
- field : 'enable',
- title : '状态' ,
- align: 'center',
- formatter: function(value, row, index) {
- return $.table.selectDictLabel(datas, value);
- }
- },
- // {
- // field : 'deleted',
- // title : '是否删除'
- // },
- {
- field : 'userDef1',
- title : '自定义字段1',
- visible:false
- },
- {
- field : 'userDef2',
- title : '自定义字段2' ,
- visible:false
- },
- {
- field : 'userDef3',
- 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= edit(\''+row.code+'\')><i class="fa fa-edit"></i>编辑</a> ');
- return actions.join('');
- }
- }]
- };
- $.table.init(options);
- });
-
- function edit(code) {
- var url = prefix + "/edit/"+code;
- $.modal.open("修改" + $.table._option.modalName, url);
- }
-</script>
-</body>
-</html>
\ No newline at end of file