wms / wms_changshabiyadi · Commits

Commit b43fa4b641ac7d118305897278024cc77ed60d3c

Authored by xqs
2 parents a27c843d 0c4b3689

xml

Inline Side-by-side
Showing 31 changed files with 1230 additions and 423 deletions
.gitignore
  View file @b43fa4b
... ... @@ -10,7 +10,7 @@ target/
10 10 *.iws
11 11 *.iml
12 12 *.ipr
13   -.idea/workspace.xml
  13 +#.idea/workspace.xml
14 14 .idea/compiler.xml
15 15  
16 16  
... ...
.idea/compiler.xml
  View file @b43fa4b
... ... @@ -6,8 +6,8 @@
6 6 <sourceOutputDir name="target/generated-sources/annotations" />
7 7 <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
8 8 <outputRelativeToContentRoot value="true" />
9   - <module name="wms2" />
10 9 <module name="huaheng" />
  10 + <module name="wms2" />
11 11 </profile>
12 12 </annotationProcessing>
13 13 </component>
... ...
.idea/dataSources.xml
  View file @b43fa4b
1 1 <?xml version="1.0" encoding="UTF-8"?>
2 2 <project version="4">
3 3 <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
4   - <data-source source="LOCAL" name="@172.16.29.45" uuid="2845c0bf-201c-4178-b161-2bab8cfbfe5d">
  4 + <data-source source="LOCAL" name="@172.16.29.45" uuid="5e014158-5749-424f-a74a-1c32e588e60f">
5 5 <driver-ref>mysql.8</driver-ref>
6 6 <synchronize>true</synchronize>
7 7 <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
... ...
src/main/java/com/huaheng/pc/config/statusFlow/controller/StatusFlowDetailController.java
  View file @b43fa4b
... ... @@ -70,7 +70,8 @@ public class StatusFlowDetailController extends BaseController {
70 70 .eq(StringUtils.isNotEmpty(statusFlowDetail.getRecordType()),
71 71 StatusFlowDetail::getRecordType, statusFlowDetail.getRecordType())
72 72 .eq(StringUtils.isNotNull(statusFlowDetail.getNessary()),
73   - StatusFlowDetail::getNessary, statusFlowDetail.getNessary());
  73 + StatusFlowDetail::getNessary, statusFlowDetail.getNessary())
  74 + .orderByAsc(StatusFlowDetail::getSequence);
74 75  
75 76 if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)){
76 77 /*使用分页查询*/
... ...
src/main/java/com/huaheng/pc/config/statusFlow/domain/StatusFlowHeader.java
  View file @b43fa4b
... ... @@ -25,14 +25,14 @@ public class StatusFlowHeader implements Serializable {
25 25 * 状态流
26 26 */
27 27 @TableField(value = "code")
28   - @ApiModelProperty(value="状态流")
  28 + @ApiModelProperty(value="编码")
29 29 private String code;
30 30  
31 31 /**
32 32 * 状态流名称
33 33 */
34 34 @TableField(value = "name")
35   - @ApiModelProperty(value="状态流名称")
  35 + @ApiModelProperty(value="名称")
36 36 private String name;
37 37  
38 38 /**
... ...
src/main/java/com/huaheng/pc/config/statusFlow/service/StatusFlowHeaderService.java
  View file @b43fa4b
1 1 package com.huaheng.pc.config.statusFlow.service;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  4 +import com.baomidou.mybatisplus.core.toolkit.Wrappers;
3 5 import org.springframework.stereotype.Service;
4 6 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
5 7 import com.huaheng.pc.config.statusFlow.domain.StatusFlowHeader;
6 8 import com.huaheng.pc.config.statusFlow.mapper.StatusFlowHeaderMapper;
7   -@Service
  9 +
  10 +import java.util.List;
  11 +import java.util.Map;
  12 +
  13 +@Service("StatusFlow")
8 14 public class StatusFlowHeaderService extends ServiceImpl<StatusFlowHeaderMapper, StatusFlowHeader> {
9 15  
  16 + public List<Map<String, Object>> flowList(){
  17 + LambdaQueryWrapper<StatusFlowHeader> lambda = Wrappers.lambdaQuery();
  18 + lambda.select(StatusFlowHeader::getCode, StatusFlowHeader::getName);
  19 + return this.listMaps(lambda);
  20 + }
10 21 }
... ...
src/main/java/com/huaheng/pc/inventory/adjustHeader/controller/adjustHeaderController.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.inventory.adjustHeader.controller;
  2 +
  3 +import com.huaheng.framework.web.controller.BaseController;
  4 +import org.springframework.stereotype.Controller;
  5 +import org.springframework.web.bind.annotation.RequestMapping;
  6 +
  7 +@Controller
  8 +@RequestMapping("/inventory/adjustHeader")
  9 +public class adjustHeaderController extends BaseController {
  10 +
  11 +
  12 +
  13 +
  14 +
  15 +
  16 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/controller/ReceiptDetailController.java
  View file @b43fa4b
... ... @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.metadata.IPage;
5 5 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
6 6 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
  7 +import com.huaheng.common.support.Convert;
7 8 import com.huaheng.common.utils.StringUtils;
8 9 import com.huaheng.common.utils.security.ShiroUtils;
9 10 import com.huaheng.framework.aspectj.lang.annotation.Log;
... ... @@ -27,6 +28,7 @@ import org.springframework.ui.ModelMap;
27 28 import org.springframework.web.bind.annotation.*;
28 29  
29 30 import javax.annotation.Resource;
  31 +import java.util.ArrayList;
30 32 import java.util.List;
31 33 import java.util.concurrent.locks.ReentrantLock;
32 34  
... ... @@ -108,4 +110,46 @@ public class ReceiptDetailController extends BaseController {
108 110 public AjaxResult addSave(ReceiptDetail receiptDetail) {
109 111 return receiptDetailService.saveReceiptDetaial(receiptDetail);
110 112 }
  113 +
  114 + /**
  115 + * 修改入库明细
  116 + */
  117 + @GetMapping("/edit/{id}")
  118 + public String edit(@PathVariable("id") Integer id, ModelMap mmap) {
  119 + ReceiptDetail receiptDetail = receiptDetailService.getById(id);
  120 + mmap.put("receiptDetail", receiptDetail);
  121 + return prefix + "/edit";
  122 + }
  123 +
  124 + /**
  125 + * 修改保存入库单
  126 + */
  127 + @ApiOperation(value="修改入库单 ", notes="修改入库单 ", httpMethod = "POST")
  128 + @RequiresPermissions("receipt:receiptDetail:add")
  129 + @Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
  130 + @PostMapping("/edit")
  131 + @ResponseBody
  132 + public AjaxResult editSave(
  133 + @ApiParam(name="receiptDetail",value="入库详情") ReceiptDetail receiptDetail) {
  134 + return receiptDetailService.updateReceiptDetaial(receiptDetail);
  135 + }
  136 +
  137 + /**
  138 + * 删除入库单
  139 + */
  140 + //@ApiOperation(value="删除入库单 ", notes="删除入库单 ", httpMethod = "POST")
  141 + //@RequiresPermissions("receipt:receiptDetail:add")
  142 + //@Log(title = "入库-入库单 ",operating = "修改入库单 ", action = BusinessType.INSERT)
  143 + //@PostMapping("/edit")
  144 + //@ResponseBody
  145 + //public AjaxResult remove(String ids) {
  146 + // if (StringUtils.isEmpty(ids)){
  147 + // return AjaxResult.error("id为空");
  148 + // }
  149 + // List<Integer> list = new ArrayList<>();
  150 + // for (Integer id : Convert.toIntArray(ids)){
  151 + // list.add(id);
  152 + // }
  153 + // return toAjax(receiptDetailService.removeByIds(list));
  154 + //}
111 155 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailService.java
  View file @b43fa4b
... ... @@ -7,4 +7,5 @@ public interface ReceiptDetailService extends IService&lt;ReceiptDetail&gt;{
7 7  
8 8 AjaxResult saveReceiptDetaial(ReceiptDetail receiptDetail);
9 9  
  10 + AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail);
10 11 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetail/service/ReceiptDetailServiceImpl.java
  View file @b43fa4b
... ... @@ -2,6 +2,7 @@ package com.huaheng.pc.receipt.receiptDetail.service;
2 2  
3 3 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
4 4 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  5 +import com.huaheng.common.exception.service.ServiceException;
5 6 import com.huaheng.common.utils.security.ShiroUtils;
6 7 import com.huaheng.framework.web.domain.AjaxResult;
7 8 import com.huaheng.pc.config.material.domain.Material;
... ... @@ -72,4 +73,49 @@ public class ReceiptDetailServiceImpl extends ServiceImpl&lt;ReceiptDetailMapper, R
72 73 }
73 74  
74 75 }
  76 +
  77 + /**
  78 + * 修改入库明细
  79 + * @param receiptDetail
  80 + * @return
  81 + */
  82 + @Override
  83 + @Transactional
  84 + public AjaxResult updateReceiptDetaial(ReceiptDetail receiptDetail) {
  85 + /* 先修改入库头表中的总数量和总行数，再更新记录，完成后更新入库头表中总数量和总行数*/
  86 +
  87 + //查询原记录
  88 + ReceiptDetail originalReceiptDetail= this.getById(receiptDetail.getId());
  89 + ReceiptHeader receiptHeader = receiptHeaderService.getById(receiptDetail.getReceiptId());
  90 + //判断物料编码是否被修改
  91 + if (!originalReceiptDetail.getMaterialCode().equals(receiptDetail.getMaterialCode())){
  92 + LambdaQueryWrapper<Material> lambda = Wrappers.lambdaQuery();
  93 + lambda.eq(Material::getCode,receiptDetail.getMaterialCode());
  94 + Material material = materialService.getOne(lambda);
  95 + if (material == null) {
  96 + throw new ServiceException("该物料编码不存在");
  97 +
  98 + }else {
  99 + receiptDetail.setMaterialName(material.getName());
  100 + receiptDetail.setMaterialSpec(material.getSpec());
  101 + receiptDetail.setMaterialUnit(material.getUnit());
  102 +
  103 + receiptHeader.setTotalQty(receiptHeader.getTotalQty()-originalReceiptDetail.getTotalQty());
  104 + receiptHeader.setTotalLines(receiptHeader.getTotalLines()-1);
  105 + if ( !receiptHeaderService.updateById(receiptHeader)){
  106 + return AjaxResult.error("入库头表更新失败");
  107 + }
  108 + }
  109 + }
  110 +
  111 + receiptDetail.setLastUpdatedBy(ShiroUtils.getLoginName());
  112 + if ( !this.updateById(receiptDetail) ){
  113 + return AjaxResult.error("入库明细更新失败");
  114 + } else {
  115 + receiptHeader.setTotalQty(receiptHeader.getTotalQty()+receiptDetail.getTotalQty());
  116 + receiptHeader.setTotalLines(receiptHeader.getTotalLines()+1);
  117 + receiptHeaderService.updateById(receiptHeader);
  118 + return AjaxResult.success("修改单据明细成功");
  119 + }
  120 + }
75 121 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/domain/ReceiptDetailHistory.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.math.BigDecimal;
  11 +import java.util.Date;
  12 +import lombok.Data;
  13 +
  14 +@ApiModel(value="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory")
  15 +@Data
  16 +@TableName(value = "receipt_detail_history")
  17 +public class ReceiptDetailHistory implements Serializable {
  18 + /**
  19 + * 入库明细内部号
  20 + */
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="入库明细内部号")
  23 + private Integer id;
  24 +
  25 + /**
  26 + * 入库单头内部号
  27 + */
  28 + @TableField(value = "receiptId")
  29 + @ApiModelProperty(value="入库单头内部号")
  30 + private Integer receiptId;
  31 +
  32 + /**
  33 + * 入库单
  34 + */
  35 + @TableField(value = "receiptCode")
  36 + @ApiModelProperty(value="入库单")
  37 + private String receiptCode;
  38 +
  39 + /**
  40 + * 仓库
  41 + */
  42 + @TableField(value = "warehouseCode")
  43 + @ApiModelProperty(value="仓库")
  44 + private String warehouseCode;
  45 +
  46 + /**
  47 + * 货主
  48 + */
  49 + @TableField(value = "companyCode")
  50 + @ApiModelProperty(value="货主")
  51 + private String companyCode;
  52 +
  53 + /**
  54 + * 物料编码
  55 + */
  56 + @TableField(value = "materialCode")
  57 + @ApiModelProperty(value="物料编码")
  58 + private String materialCode;
  59 +
  60 + /**
  61 + * 物料信息
  62 + */
  63 + @TableField(value = "materialName")
  64 + @ApiModelProperty(value="物料信息")
  65 + private String materialName;
  66 +
  67 + /**
  68 + * 物料规格
  69 + */
  70 + @TableField(value = "materialSpec")
  71 + @ApiModelProperty(value="物料规格")
  72 + private String materialSpec;
  73 +
  74 + /**
  75 + * 物料单位
  76 + */
  77 + @TableField(value = "materialUnit")
  78 + @ApiModelProperty(value="物料单位")
  79 + private String materialUnit;
  80 +
  81 + /**
  82 + * 供应商编码
  83 + */
  84 + @TableField(value = "supplierCode")
  85 + @ApiModelProperty(value="供应商编码")
  86 + private String supplierCode;
  87 +
  88 + /**
  89 + * 批次
  90 + */
  91 + @TableField(value = "batch")
  92 + @ApiModelProperty(value="批次")
  93 + private String batch;
  94 +
  95 + /**
  96 + * 批号
  97 + */
  98 + @TableField(value = "lot")
  99 + @ApiModelProperty(value="批号")
  100 + private String lot;
  101 +
  102 + /**
  103 + * 质检
  104 + */
  105 + @TableField(value = "qcCheck")
  106 + @ApiModelProperty(value="质检")
  107 + private String qcCheck;
  108 +
  109 + /**
  110 + * 项目号
  111 + */
  112 + @TableField(value = "projectNo")
  113 + @ApiModelProperty(value="项目号")
  114 + private String projectNo;
  115 +
  116 + /**
  117 + * 生产日期
  118 + */
  119 + @TableField(value = "manufactureDate")
  120 + @ApiModelProperty(value="生产日期")
  121 + private Date manufactureDate;
  122 +
  123 + /**
  124 + * 失效日期
  125 + */
  126 + @TableField(value = "expirationDate")
  127 + @ApiModelProperty(value="失效日期")
  128 + private Date expirationDate;
  129 +
  130 + /**
  131 + * 入库日期
  132 + */
  133 + @TableField(value = "agingDate")
  134 + @ApiModelProperty(value="入库日期")
  135 + private Date agingDate;
  136 +
  137 + /**
  138 + * 属性模板
  139 + */
  140 + @TableField(value = "attributeTemplateCode")
  141 + @ApiModelProperty(value="属性模板")
  142 + private String attributeTemplateCode;
  143 +
  144 + /**
  145 + * 属性1
  146 + */
  147 + @TableField(value = "attribute1")
  148 + @ApiModelProperty(value="属性1")
  149 + private String attribute1;
  150 +
  151 + /**
  152 + * 属性2
  153 + */
  154 + @TableField(value = "attribute2")
  155 + @ApiModelProperty(value="属性2")
  156 + private String attribute2;
  157 +
  158 + /**
  159 + * 属性3
  160 + */
  161 + @TableField(value = "attribute3")
  162 + @ApiModelProperty(value="属性3")
  163 + private String attribute3;
  164 +
  165 + /**
  166 + * 属性4
  167 + */
  168 + @TableField(value = "attribute4")
  169 + @ApiModelProperty(value="属性4")
  170 + private String attribute4;
  171 +
  172 + /**
  173 + * 总数量
  174 + */
  175 + @TableField(value = "totalQty")
  176 + @ApiModelProperty(value="总数量")
  177 + private Integer totalQty;
  178 +
  179 + /**
  180 + * 未收数量
  181 + */
  182 + @TableField(value = "openQty")
  183 + @ApiModelProperty(value="未收数量")
  184 + private Integer openQty;
  185 +
  186 + /**
  187 + * ERP单号
  188 + */
  189 + @TableField(value = "referCode")
  190 + @ApiModelProperty(value="ERP单号")
  191 + private String referCode;
  192 +
  193 + /**
  194 + * ERP内部号
  195 + */
  196 + @TableField(value = "referId")
  197 + @ApiModelProperty(value="ERP内部号")
  198 + private Integer referId;
  199 +
  200 + /**
  201 + * ERP行号
  202 + */
  203 + @TableField(value = "referLineNum")
  204 + @ApiModelProperty(value="ERP行号")
  205 + private String referLineNum;
  206 +
  207 + /**
  208 + * 定位规则
  209 + */
  210 + @TableField(value = "locatingRule")
  211 + @ApiModelProperty(value="定位规则")
  212 + private String locatingRule;
  213 +
  214 + /**
  215 + * 库存状态
  216 + */
  217 + @TableField(value = "inventorySts")
  218 + @ApiModelProperty(value="库存状态")
  219 + private String inventorySts;
  220 +
  221 + /**
  222 + * 标价
  223 + */
  224 + @TableField(value = "itemListPrice")
  225 + @ApiModelProperty(value="标价")
  226 + private BigDecimal itemListPrice;
  227 +
  228 + /**
  229 + * 净价
  230 + */
  231 + @TableField(value = "itemNetPrice")
  232 + @ApiModelProperty(value="净价")
  233 + private BigDecimal itemNetPrice;
  234 +
  235 + /**
  236 + * 是否虚拟套件
  237 + */
  238 + @TableField(value = "isVirtualBom")
  239 + @ApiModelProperty(value="是否虚拟套件")
  240 + private Integer isVirtualBom;
  241 +
  242 + /**
  243 + * 创建时间
  244 + */
  245 + @TableField(value = "created")
  246 + @ApiModelProperty(value="创建时间")
  247 + private Date created;
  248 +
  249 + /**
  250 + * 创建用户
  251 + */
  252 + @TableField(value = "createdBy")
  253 + @ApiModelProperty(value="创建用户")
  254 + private String createdBy;
  255 +
  256 + /**
  257 + * 创建时间
  258 + */
  259 + @TableField(value = "lastUpdated")
  260 + @ApiModelProperty(value="创建时间")
  261 + private Date lastUpdated;
  262 +
  263 + /**
  264 + * 更新用户
  265 + */
  266 + @TableField(value = "lastUpdatedBy")
  267 + @ApiModelProperty(value="更新用户")
  268 + private String lastUpdatedBy;
  269 +
  270 + /**
  271 + * 数据版本
  272 + */
  273 + @TableField(value = "version")
  274 + @ApiModelProperty(value="数据版本")
  275 + private Integer version;
  276 +
  277 + /**
  278 + * 自定义字段1
  279 + */
  280 + @TableField(value = "userDef1")
  281 + @ApiModelProperty(value="自定义字段1")
  282 + private String userDef1;
  283 +
  284 + /**
  285 + * 自定义字段2
  286 + */
  287 + @TableField(value = "userDef2")
  288 + @ApiModelProperty(value="自定义字段2")
  289 + private String userDef2;
  290 +
  291 + /**
  292 + * 自定义字段3
  293 + */
  294 + @TableField(value = "userDef3")
  295 + @ApiModelProperty(value="自定义字段3")
  296 + private String userDef3;
  297 +
  298 + /**
  299 + * 自定义字段4
  300 + */
  301 + @TableField(value = "userDef4")
  302 + @ApiModelProperty(value="自定义字段4")
  303 + private String userDef4;
  304 +
  305 + /**
  306 + * 自定义字段5
  307 + */
  308 + @TableField(value = "userDef5")
  309 + @ApiModelProperty(value="自定义字段5")
  310 + private String userDef5;
  311 +
  312 + /**
  313 + * 自定义字段6
  314 + */
  315 + @TableField(value = "userDef6")
  316 + @ApiModelProperty(value="自定义字段6")
  317 + private String userDef6;
  318 +
  319 + /**
  320 + * 自定义字段7
  321 + */
  322 + @TableField(value = "userDef7")
  323 + @ApiModelProperty(value="自定义字段7")
  324 + private String userDef7;
  325 +
  326 + /**
  327 + * 自定义字段8
  328 + */
  329 + @TableField(value = "userDef8")
  330 + @ApiModelProperty(value="自定义字段8")
  331 + private String userDef8;
  332 +
  333 + /**
  334 + * 处理标记
  335 + */
  336 + @TableField(value = "processStamp")
  337 + @ApiModelProperty(value="处理标记")
  338 + private String processStamp;
  339 +
  340 + /**
  341 + * 是否删除
  342 + */
  343 + @TableField(value = "deleted")
  344 + @ApiModelProperty(value="是否删除")
  345 + private Boolean deleted;
  346 +
  347 + private static final long serialVersionUID = 1L;
  348 +}
0 349 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/mapper/ReceiptDetailHistoryMapper.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
  5 +
  6 +public interface ReceiptDetailHistoryMapper extends BaseMapper<ReceiptDetailHistory> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptDetailHistory/service/ReceiptDetailHistoryService.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptDetailHistory.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory;
  8 +import com.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper;
  9 +@Service
  10 +public class ReceiptDetailHistoryService extends ServiceImpl<ReceiptDetailHistoryMapper, ReceiptDetailHistory> {
  11 +
  12 +}
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @b43fa4b
... ... @@ -16,7 +16,9 @@ import com.huaheng.framework.web.page.TableSupport;
16 16 import com.huaheng.pc.receipt.receiptHeader.domain.ReceiptHeader;
17 17 import com.huaheng.pc.receipt.receiptHeader.service.ReceiptHeaderService;
18 18 import io.swagger.annotations.Api;
  19 +import io.swagger.annotations.ApiModel;
19 20 import io.swagger.annotations.ApiOperation;
  21 +import io.swagger.annotations.ApiParam;
20 22 import org.apache.shiro.authz.annotation.RequiresPermissions;
21 23 import org.springframework.stereotype.Controller;
22 24 import org.springframework.ui.ModelMap;
... ... @@ -49,7 +51,9 @@ public class ReceiptHeaderController extends BaseController {
49 51 @Log(title = "入库-入库单头表", operating = "查看入库单列表", action = BusinessType.GRANT)
50 52 @PostMapping("/list")
51 53 @ResponseBody
52   - public TableDataInfo list(ReceiptHeader receiptHeader, String createdBegin, String createdEnd) {
  54 + public TableDataInfo list(@ApiParam(name="receiptDetail",value="入库头表")ReceiptHeader receiptHeader,
  55 + @ApiParam(name = "createdBegin", value = "起止时间") String createdBegin,
  56 + @ApiParam(name = "createdEnd", value = "结束时间") String createdEnd) {
53 57 LambdaQueryWrapper<ReceiptHeader> lambdaQueryWrapper = Wrappers.lambdaQuery();
54 58 PageDomain pageDomain = TableSupport.buildPageRequest();
55 59 Integer pageNum = pageDomain.getPageNum();
... ... @@ -122,4 +126,41 @@ public class ReceiptHeaderController extends BaseController {
122 126 receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
123 127 return toAjax(receiptHeaderService.updateById(receiptHeader));
124 128 }
  129 +
  130 + /**
  131 + * 审核入库单
  132 + */
  133 + @ApiOperation(value="审核入库单", notes="审核入库单", httpMethod = "POST")
  134 + @RequiresPermissions("receipt:receiptHeader:approval")
  135 + @Log(title = "入库-入库单 ",operating = "审核入库单 ", action = BusinessType.UPDATE)
  136 + @PostMapping("/approval")
  137 + @ResponseBody
  138 + public AjaxResult approval(@ApiParam(name="id",value="入库头表id") Integer id,
  139 + @ApiParam(name="approval",value="审核结果值，10审核驳回，20作废，100审核成功") Integer approval) {
  140 + ReceiptHeader receiptHeader = new ReceiptHeader();
  141 + if (approval != 10 || approval != 20 || approval != 100){
  142 + return AjaxResult.error("传入参数错误");
  143 + }
  144 + receiptHeader.setId(id);
  145 + receiptHeader.setLastStatus(approval);
  146 + receiptHeader.setFirstStatus(approval);
  147 + receiptHeader.setLastUpdatedBy(ShiroUtils.getLoginName());
  148 + return toAjax(receiptHeaderService.updateById(receiptHeader));
  149 + }
  150 +
  151 + /**
  152 + * 提交审核入库单
  153 + */
  154 + @ApiOperation(value="提交审核入库单", notes="提交审核入库单", httpMethod = "POST")
  155 + @RequiresPermissions("receipt:receiptHeader:approval")
  156 + @Log(title = "入库-入库单 ",operating = "提交审核入库单 ", action = BusinessType.UPDATE)
  157 + @PostMapping("/submitReview")
  158 + @ResponseBody
  159 + public AjaxResult submitReview(@ApiParam(name="id",value="入库头表id") Integer id) {
  160 + ReceiptHeader receiptHeader = new ReceiptHeader();
  161 + receiptHeader.setId(id);
  162 + receiptHeader.setFirstStatus(5);
  163 + receiptHeader.setLastStatus(5);
  164 + return toAjax(receiptHeaderService.updateById(receiptHeader));
  165 + }
125 166 }
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/domain/ReceiptHeaderHistory.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.domain;
  2 +
  3 +import com.baomidou.mybatisplus.annotation.IdType;
  4 +import com.baomidou.mybatisplus.annotation.TableField;
  5 +import com.baomidou.mybatisplus.annotation.TableId;
  6 +import com.baomidou.mybatisplus.annotation.TableName;
  7 +import io.swagger.annotations.ApiModel;
  8 +import io.swagger.annotations.ApiModelProperty;
  9 +import java.io.Serializable;
  10 +import java.math.BigDecimal;
  11 +import java.util.Date;
  12 +import lombok.Data;
  13 +
  14 +@ApiModel(value="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory")
  15 +@Data
  16 +@TableName(value = "receipt_header_history")
  17 +public class ReceiptHeaderHistory implements Serializable {
  18 + /**
  19 + * 入库单内部号
  20 + */
  21 + @TableId(value = "id", type = IdType.AUTO)
  22 + @ApiModelProperty(value="入库单内部号")
  23 + private Integer id;
  24 +
  25 + /**
  26 + * 仓库
  27 + */
  28 + @TableField(value = "warehouseCode")
  29 + @ApiModelProperty(value="仓库")
  30 + private String warehouseCode;
  31 +
  32 + /**
  33 + * 货主
  34 + */
  35 + @TableField(value = "companyCode")
  36 + @ApiModelProperty(value="货主")
  37 + private String companyCode;
  38 +
  39 + /**
  40 + * 入库单号
  41 + */
  42 + @TableField(value = "code")
  43 + @ApiModelProperty(value="入库单号")
  44 + private String code;
  45 +
  46 + /**
  47 + * 入库类型
  48 + */
  49 + @TableField(value = "receiptType")
  50 + @ApiModelProperty(value="入库类型")
  51 + private String receiptType;
  52 +
  53 + /**
  54 + * 首状态
  55 + */
  56 + @TableField(value = "firstStatus")
  57 + @ApiModelProperty(value="首状态")
  58 + private Integer firstStatus;
  59 +
  60 + /**
  61 + * 尾状态
  62 + */
  63 + @TableField(value = "lastStatus")
  64 + @ApiModelProperty(value="尾状态")
  65 + private Integer lastStatus;
  66 +
  67 + /**
  68 + * 关联单号
  69 + */
  70 + @TableField(value = "referCode")
  71 + @ApiModelProperty(value="关联单号")
  72 + private String referCode;
  73 +
  74 + /**
  75 + * 关联单号（内部号）
  76 + */
  77 + @TableField(value = "referId")
  78 + @ApiModelProperty(value="关联单号（内部号）")
  79 + private Integer referId;
  80 +
  81 + /**
  82 + * 关联订单类型
  83 + */
  84 + @TableField(value = "referType")
  85 + @ApiModelProperty(value="关联订单类型")
  86 + private String referType;
  87 +
  88 + /**
  89 + * 预计到达日期
  90 + */
  91 + @TableField(value = "scheduledArriveDate")
  92 + @ApiModelProperty(value="预计到达日期")
  93 + private Date scheduledArriveDate;
  94 +
  95 + /**
  96 + * 实际到达日期
  97 + */
  98 + @TableField(value = "actualArriveDate")
  99 + @ApiModelProperty(value="实际到达日期")
  100 + private Date actualArriveDate;
  101 +
  102 + /**
  103 + * 月台货位
  104 + */
  105 + @TableField(value = "recvDock")
  106 + @ApiModelProperty(value="月台货位")
  107 + private String recvDock;
  108 +
  109 + /**
  110 + * 关闭时间
  111 + */
  112 + @TableField(value = "closedAt")
  113 + @ApiModelProperty(value="关闭时间")
  114 + private Date closedAt;
  115 +
  116 + /**
  117 + * 强制关闭用户
  118 + */
  119 + @TableField(value = "closedBy")
  120 + @ApiModelProperty(value="强制关闭用户")
  121 + private String closedBy;
  122 +
  123 + /**
  124 + * 开始收货日期
  125 + */
  126 + @TableField(value = "startCheckinDatetime")
  127 + @ApiModelProperty(value="开始收货日期")
  128 + private Date startCheckinDatetime;
  129 +
  130 + /**
  131 + * 结束收货日期
  132 + */
  133 + @TableField(value = "endCheckinDatetime")
  134 + @ApiModelProperty(value="结束收货日期")
  135 + private Date endCheckinDatetime;
  136 +
  137 + /**
  138 + * 总数量
  139 + */
  140 + @TableField(value = "totalQty")
  141 + @ApiModelProperty(value="总数量")
  142 + private Integer totalQty;
  143 +
  144 + /**
  145 + * 总行数
  146 + */
  147 + @TableField(value = "totalLines")
  148 + @ApiModelProperty(value="总行数")
  149 + private Integer totalLines;
  150 +
  151 + /**
  152 + * 总箱数
  153 + */
  154 + @TableField(value = "toalCases")
  155 + @ApiModelProperty(value="总箱数")
  156 + private Integer toalCases;
  157 +
  158 + /**
  159 + * 总重量
  160 + */
  161 + @TableField(value = "totalWeight")
  162 + @ApiModelProperty(value="总重量")
  163 + private BigDecimal totalWeight;
  164 +
  165 + /**
  166 + * 总体积
  167 + */
  168 + @TableField(value = "totalVolume")
  169 + @ApiModelProperty(value="总体积")
  170 + private BigDecimal totalVolume;
  171 +
  172 + /**
  173 + * 入库单备注
  174 + */
  175 + @TableField(value = "receiptNote")
  176 + @ApiModelProperty(value="入库单备注")
  177 + private String receiptNote;
  178 +
  179 + /**
  180 + * 锁定
  181 + */
  182 + @TableField(value = "locked")
  183 + @ApiModelProperty(value="锁定")
  184 + private Integer locked;
  185 +
  186 + /**
  187 + * 锁定用户
  188 + */
  189 + @TableField(value = "lockedBy")
  190 + @ApiModelProperty(value="锁定用户")
  191 + private String lockedBy;
  192 +
  193 + /**
  194 + * 创建时间
  195 + */
  196 + @TableField(value = "created")
  197 + @ApiModelProperty(value="创建时间")
  198 + private Date created;
  199 +
  200 + /**
  201 + * 创建用户
  202 + */
  203 + @TableField(value = "createdBy")
  204 + @ApiModelProperty(value="创建用户")
  205 + private String createdBy;
  206 +
  207 + /**
  208 + * 创建时间
  209 + */
  210 + @TableField(value = "lastUpdated")
  211 + @ApiModelProperty(value="创建时间")
  212 + private Date lastUpdated;
  213 +
  214 + /**
  215 + * 更新用户
  216 + */
  217 + @TableField(value = "lastUpdatedBy")
  218 + @ApiModelProperty(value="更新用户")
  219 + private String lastUpdatedBy;
  220 +
  221 + /**
  222 + * 数据版本
  223 + */
  224 + @TableField(value = "version")
  225 + @ApiModelProperty(value="数据版本")
  226 + private Integer version;
  227 +
  228 + /**
  229 + * 自定义字段1
  230 + */
  231 + @TableField(value = "userDef1")
  232 + @ApiModelProperty(value="自定义字段1")
  233 + private String userDef1;
  234 +
  235 + /**
  236 + * 自定义字段2
  237 + */
  238 + @TableField(value = "userDef2")
  239 + @ApiModelProperty(value="自定义字段2")
  240 + private String userDef2;
  241 +
  242 + /**
  243 + * 自定义字段3
  244 + */
  245 + @TableField(value = "userDef3")
  246 + @ApiModelProperty(value="自定义字段3")
  247 + private String userDef3;
  248 +
  249 + /**
  250 + * 自定义字段4
  251 + */
  252 + @TableField(value = "userDef4")
  253 + @ApiModelProperty(value="自定义字段4")
  254 + private String userDef4;
  255 +
  256 + /**
  257 + * 自定义字段5
  258 + */
  259 + @TableField(value = "userDef5")
  260 + @ApiModelProperty(value="自定义字段5")
  261 + private String userDef5;
  262 +
  263 + /**
  264 + * 自定义字段6
  265 + */
  266 + @TableField(value = "userDef6")
  267 + @ApiModelProperty(value="自定义字段6")
  268 + private String userDef6;
  269 +
  270 + /**
  271 + * 自定义字段7
  272 + */
  273 + @TableField(value = "userDef7")
  274 + @ApiModelProperty(value="自定义字段7")
  275 + private String userDef7;
  276 +
  277 + /**
  278 + * 自定义字段8
  279 + */
  280 + @TableField(value = "userDef8")
  281 + @ApiModelProperty(value="自定义字段8")
  282 + private String userDef8;
  283 +
  284 + /**
  285 + * 处理标记
  286 + */
  287 + @TableField(value = "processStamp")
  288 + @ApiModelProperty(value="处理标记")
  289 + private String processStamp;
  290 +
  291 + /**
  292 + * 是否删除
  293 + */
  294 + @TableField(value = "deleted")
  295 + @ApiModelProperty(value="是否删除")
  296 + private Boolean deleted;
  297 +
  298 + private static final long serialVersionUID = 1L;
  299 +}
0 300 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/mapper/ReceiptHeaderHistoryMapper.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.mapper;
  2 +
  3 +import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  4 +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
  5 +
  6 +public interface ReceiptHeaderHistoryMapper extends BaseMapper<ReceiptHeaderHistory> {
  7 +}
0 8 \ No newline at end of file
... ...
src/main/java/com/huaheng/pc/receipt/receiptHeaderHistory/service/ReceiptHeaderHistoryService.java 0 → 100644
  View file @b43fa4b
  1 +package com.huaheng.pc.receipt.receiptHeaderHistory.service;
  2 +
  3 +import org.springframework.stereotype.Service;
  4 +import javax.annotation.Resource;
  5 +import java.util.List;
  6 +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
  7 +import com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory;
  8 +import com.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper;
  9 +@Service
  10 +public class ReceiptHeaderHistoryService extends ServiceImpl<ReceiptHeaderHistoryMapper, ReceiptHeaderHistory> {
  11 +
  12 +}
... ...
src/main/resources/mybatis/receipt/ReceiptDetailHistoryMapper.xml 0 → 100644
  View file @b43fa4b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.receipt.receiptDetailHistory.mapper.ReceiptDetailHistoryMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptDetailHistory.domain.ReceiptDetailHistory">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="receiptId" jdbcType="INTEGER" property="receiptId" />
  8 + <result column="receiptCode" jdbcType="VARCHAR" property="receiptCode" />
  9 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  10 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  11 + <result column="materialCode" jdbcType="VARCHAR" property="materialCode" />
  12 + <result column="materialName" jdbcType="VARCHAR" property="materialName" />
  13 + <result column="materialSpec" jdbcType="VARCHAR" property="materialSpec" />
  14 + <result column="materialUnit" jdbcType="VARCHAR" property="materialUnit" />
  15 + <result column="supplierCode" jdbcType="VARCHAR" property="supplierCode" />
  16 + <result column="batch" jdbcType="VARCHAR" property="batch" />
  17 + <result column="lot" jdbcType="VARCHAR" property="lot" />
  18 + <result column="qcCheck" jdbcType="VARCHAR" property="qcCheck" />
  19 + <result column="projectNo" jdbcType="VARCHAR" property="projectNo" />
  20 + <result column="manufactureDate" jdbcType="DATE" property="manufactureDate" />
  21 + <result column="expirationDate" jdbcType="DATE" property="expirationDate" />
  22 + <result column="agingDate" jdbcType="DATE" property="agingDate" />
  23 + <result column="attributeTemplateCode" jdbcType="VARCHAR" property="attributeTemplateCode" />
  24 + <result column="attribute1" jdbcType="VARCHAR" property="attribute1" />
  25 + <result column="attribute2" jdbcType="VARCHAR" property="attribute2" />
  26 + <result column="attribute3" jdbcType="VARCHAR" property="attribute3" />
  27 + <result column="attribute4" jdbcType="VARCHAR" property="attribute4" />
  28 + <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
  29 + <result column="openQty" jdbcType="INTEGER" property="openQty" />
  30 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  31 + <result column="referId" jdbcType="INTEGER" property="referId" />
  32 + <result column="referLineNum" jdbcType="VARCHAR" property="referLineNum" />
  33 + <result column="locatingRule" jdbcType="VARCHAR" property="locatingRule" />
  34 + <result column="inventorySts" jdbcType="VARCHAR" property="inventorySts" />
  35 + <result column="itemListPrice" jdbcType="DECIMAL" property="itemListPrice" />
  36 + <result column="itemNetPrice" jdbcType="DECIMAL" property="itemNetPrice" />
  37 + <result column="isVirtualBom" jdbcType="INTEGER" property="isVirtualBom" />
  38 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  39 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  40 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  41 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  42 + <result column="version" jdbcType="INTEGER" property="version" />
  43 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  44 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  45 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  46 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  47 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  48 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  49 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  50 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  51 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  52 + <result column="deleted" jdbcType="BIT" property="deleted" />
  53 + </resultMap>
  54 + <sql id="Base_Column_List">
  55 + <!--@mbg.generated-->
  56 + id, receiptId, receiptCode, warehouseCode, companyCode, materialCode, materialName,
  57 + materialSpec, materialUnit, supplierCode, batch, lot, qcCheck, projectNo, manufactureDate,
  58 + expirationDate, agingDate, attributeTemplateCode, attribute1, attribute2, attribute3,
  59 + attribute4, totalQty, openQty, referCode, referId, referLineNum, locatingRule, inventorySts,
  60 + itemListPrice, itemNetPrice, isVirtualBom, created, createdBy, lastUpdated, lastUpdatedBy,
  61 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  62 + processStamp, deleted
  63 + </sql>
  64 +</mapper>
0 65 \ No newline at end of file
... ...
src/main/resources/mybatis/receipt/ReceiptHeaderHistoryMapper.xml 0 → 100644
  View file @b43fa4b
  1 +<?xml version="1.0" encoding="UTF-8"?>
  2 +<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
  3 +<mapper namespace="com.huaheng.pc.receipt.receiptHeaderHistory.mapper.ReceiptHeaderHistoryMapper">
  4 + <resultMap id="BaseResultMap" type="com.huaheng.pc.receipt.receiptHeaderHistory.domain.ReceiptHeaderHistory">
  5 + <!--@mbg.generated-->
  6 + <id column="id" jdbcType="INTEGER" property="id" />
  7 + <result column="warehouseCode" jdbcType="VARCHAR" property="warehouseCode" />
  8 + <result column="companyCode" jdbcType="VARCHAR" property="companyCode" />
  9 + <result column="code" jdbcType="VARCHAR" property="code" />
  10 + <result column="receiptType" jdbcType="VARCHAR" property="receiptType" />
  11 + <result column="firstStatus" jdbcType="INTEGER" property="firstStatus" />
  12 + <result column="lastStatus" jdbcType="INTEGER" property="lastStatus" />
  13 + <result column="referCode" jdbcType="VARCHAR" property="referCode" />
  14 + <result column="referId" jdbcType="INTEGER" property="referId" />
  15 + <result column="referType" jdbcType="VARCHAR" property="referType" />
  16 + <result column="scheduledArriveDate" jdbcType="DATE" property="scheduledArriveDate" />
  17 + <result column="actualArriveDate" jdbcType="DATE" property="actualArriveDate" />
  18 + <result column="recvDock" jdbcType="VARCHAR" property="recvDock" />
  19 + <result column="closedAt" jdbcType="DATE" property="closedAt" />
  20 + <result column="closedBy" jdbcType="VARCHAR" property="closedBy" />
  21 + <result column="startCheckinDatetime" jdbcType="TIMESTAMP" property="startCheckinDatetime" />
  22 + <result column="endCheckinDatetime" jdbcType="TIMESTAMP" property="endCheckinDatetime" />
  23 + <result column="totalQty" jdbcType="INTEGER" property="totalQty" />
  24 + <result column="totalLines" jdbcType="INTEGER" property="totalLines" />
  25 + <result column="toalCases" jdbcType="INTEGER" property="toalCases" />
  26 + <result column="totalWeight" jdbcType="DECIMAL" property="totalWeight" />
  27 + <result column="totalVolume" jdbcType="DECIMAL" property="totalVolume" />
  28 + <result column="receiptNote" jdbcType="VARCHAR" property="receiptNote" />
  29 + <result column="locked" jdbcType="INTEGER" property="locked" />
  30 + <result column="lockedBy" jdbcType="VARCHAR" property="lockedBy" />
  31 + <result column="created" jdbcType="TIMESTAMP" property="created" />
  32 + <result column="createdBy" jdbcType="VARCHAR" property="createdBy" />
  33 + <result column="lastUpdated" jdbcType="TIMESTAMP" property="lastUpdated" />
  34 + <result column="lastUpdatedBy" jdbcType="VARCHAR" property="lastUpdatedBy" />
  35 + <result column="version" jdbcType="INTEGER" property="version" />
  36 + <result column="userDef1" jdbcType="VARCHAR" property="userDef1" />
  37 + <result column="userDef2" jdbcType="VARCHAR" property="userDef2" />
  38 + <result column="userDef3" jdbcType="VARCHAR" property="userDef3" />
  39 + <result column="userDef4" jdbcType="VARCHAR" property="userDef4" />
  40 + <result column="userDef5" jdbcType="VARCHAR" property="userDef5" />
  41 + <result column="userDef6" jdbcType="VARCHAR" property="userDef6" />
  42 + <result column="userDef7" jdbcType="VARCHAR" property="userDef7" />
  43 + <result column="userDef8" jdbcType="VARCHAR" property="userDef8" />
  44 + <result column="processStamp" jdbcType="VARCHAR" property="processStamp" />
  45 + <result column="deleted" jdbcType="BIT" property="deleted" />
  46 + </resultMap>
  47 + <sql id="Base_Column_List">
  48 + <!--@mbg.generated-->
  49 + id, warehouseCode, companyCode, code, receiptType, firstStatus, lastStatus, referCode,
  50 + referId, referType, scheduledArriveDate, actualArriveDate, recvDock, closedAt, closedBy,
  51 + startCheckinDatetime, endCheckinDatetime, totalQty, totalLines, toalCases, totalWeight,
  52 + totalVolume, receiptNote, locked, lockedBy, created, createdBy, lastUpdated, lastUpdatedBy,
  53 + version, userDef1, userDef2, userDef3, userDef4, userDef5, userDef6, userDef7, userDef8,
  54 + processStamp, deleted
  55 + </sql>
  56 +</mapper>
0 57 \ No newline at end of file
... ...
src/main/resources/templates/config/receiptType/add.html
  View file @b43fa4b
... ... @@ -46,7 +46,9 @@
46 46 <div class="form-group">
47 47 <label class="col-sm-3 control-label">入库流程：</label>
48 48 <div class="col-sm-8">
49   - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text">
  49 + <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}">
  50 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  51 + </select>
50 52 </div>
51 53 </div>
52 54 <!--<div class="form-group">
... ... @@ -167,6 +169,7 @@
167 169 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
168 170 var tableValue = $.common.getTableValue("#form-receiptType-add");
169 171 tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  172 + tableValue = formValueReplace(tableValue, "receiptFlow", $("#receiptFlow option:selected").val());
170 173 tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
171 174 $.operate.save(prefix + "/add", tableValue);
172 175 }
... ...
src/main/resources/templates/config/receiptType/edit.html
  View file @b43fa4b
... ... @@ -48,7 +48,9 @@
48 48 <div class="form-group">
49 49 <label class="col-sm-3 control-label">入库流程：</label>
50 50 <div class="col-sm-8">
51   - <input id="receiptFlow" name="receiptFlow" class="form-control" type="text" th:field="*{receiptFlow}">
  51 + <select id="receiptFlow" name="receiptFlow" class="form-control" th:with="statusFlowList=${@StatusFlow.flowList()}" th:field="*{receiptFlow}">
  52 + <option th:each="flow : ${statusFlowList}" th:text="${flow['name']}" th:value="${flow['code']}"></option>
  53 + </select>
52 54 </div>
53 55 </div>
54 56 <!--<div class="form-group">
... ... @@ -169,6 +171,8 @@
169 171 // $.operate.save(prefix + "/add", $('#form-locationType-add').serialize());
170 172 var tableValue = $.common.getTableValue("#form-receiptType-edit");
171 173 tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val());
  174 + tableValue = formValueReplace(tableValue, "receiptFlow", $("#receiptFlow option:selected").val());
  175 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
172 176 $.operate.save(prefix + "/edit", tableValue);
173 177 }
174 178 });
... ...
src/main/resources/templates/config/statusFlowDetail/edit.html
  View file @b43fa4b
... ... @@ -16,7 +16,7 @@
16 16 <div class="form-group">
17 17 <label class="col-sm-3 control-label">模块：</label>
18 18 <div class="col-sm-8">
19   - <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{modlueType}">
  19 + <input id="moduleType" name="moduleType" class="form-control" type="text" th:field="*{moduleType}">
20 20 </div>
21 21 </div>
22 22 <div class="form-group">
... ... @@ -26,7 +26,7 @@
26 26 </div>
27 27 </div>
28 28 <div class="form-group">
29   - <label class="col-sm-3 control-label">类型：</label>
  29 + <label class="col-sm-3 control-label">序号：</label>
30 30 <div class="col-sm-8">
31 31 <input id="sequence" name="sequence" class="form-control" type="text" th:field="*{sequence}">
32 32 </div>
... ... @@ -53,11 +53,11 @@
53 53 <!-- </div>-->
54 54 <!--</div>-->
55 55 <div class="form-group">
56   - <label class="col-sm-3 control-label">是否启用：</label>
  56 + <label class="col-sm-3 control-label">是否有效：</label>
57 57 <div class="col-sm-8">
  58 + <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
58 59 <div class="onoffswitch">
59   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox"
60   - id="enable" name="enable" th:field="*{enable}">
  60 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
61 61 <label class="onoffswitch-label" for="enable">
62 62 <span class="onoffswitch-inner"></span>
63 63 <span class="onoffswitch-switch"></span>
... ... @@ -75,7 +75,7 @@
75 75 </div>
76 76 <div th:include="include::footer"></div>
77 77 <script type="text/javascript">
78   - var prefix = ctx + "config/statusFlowDetails";
  78 + var prefix = ctx + "config/statusFlowDetail";
79 79 $("#form-statusFlowDetails-edit").validate({
80 80 rules:{
81 81 flowCode:{
... ... @@ -96,7 +96,7 @@
96 96 var tableValue = $.common.getTableValue("#form-statusFlowDetails-edit");
97 97 tableValue = formValueReplace(tableValue, "nessary", $("#nessary option:selected").val());
98 98 tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
99   - $.operate.save(prefix + "/add", tableValue);
  99 + $.operate.save(prefix + "/edit", tableValue);
100 100 }
101 101 });
102 102 </script>
... ...
src/main/resources/templates/config/statusFlowDetail/statusFlowDetail.html
  View file @b43fa4b
... ... @@ -23,6 +23,7 @@
23 23 var editFlag = [[${@permission.hasPermi('config:statusFlowDetails:edit')}]];
24 24 var removeFlag = [[${@permission.hasPermi('config:statusFlowDetails:remove')}]];
25 25 var datas = [[${@dict.getType('sys_normal_disable')}]];
  26 + var nessaryDatas = [[${@dict.getType('nessary')}]];
26 27 $(function() {
27 28 var options = {
28 29 url: prefix + "/list",
... ... @@ -81,7 +82,7 @@
81 82 title : '是否是必须流程',
82 83 align: 'center',
83 84 formatter: function(value, row, index) {
84   - return $.table.selectDictLabel(datas, value);
  85 + return $.table.selectDictLabel(nessaryDatas, value);
85 86 }
86 87 },
87 88 {
... ...
src/main/resources/templates/config/statusFlowHeader/add.html
  View file @b43fa4b
... ... @@ -6,13 +6,13 @@
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-statusFlowHeader-add">
8 8 <div class="form-group">
9   - <label class="col-sm-3 control-label">状态流：</label>
  9 + <label class="col-sm-3 control-label">编码：</label>
10 10 <div class="col-sm-8">
11 11 <input id="code" name="code" class="form-control" type="text">
12 12 </div>
13 13 </div>
14 14 <div class="form-group">
15   - <label class="col-sm-3 control-label">状态流名称：</label>
  15 + <label class="col-sm-3 control-label">名称：</label>
16 16 <div class="col-sm-8">
17 17 <input id="name" name="name" class="form-control" type="text">
18 18 </div>
... ...
src/main/resources/templates/config/statusFlowHeader/edit.html
  View file @b43fa4b
... ... @@ -7,13 +7,13 @@
7 7 <form class="form-horizontal m" id="form-statusFlowHeader-edit" th:object="${statusFlowHeader}">
8 8 <input name="id" th:field="*{id}" type="hidden">
9 9 <div class="form-group">
10   - <label class="col-sm-3 control-label">状态流：</label>
  10 + <label class="col-sm-3 control-label">编码：</label>
11 11 <div class="col-sm-8">
12 12 <input id="code" name="code" class="form-control" type="text" th:field="*{code}">
13 13 </div>
14 14 </div>
15 15 <div class="form-group">
16   - <label class="col-sm-3 control-label">状态流名称：</label>
  16 + <label class="col-sm-3 control-label">名称：</label>
17 17 <div class="col-sm-8">
18 18 <input id="name" name="name" class="form-control" type="text" th:field="*{name}">
19 19 </div>
... ... @@ -43,11 +43,11 @@
43 43 <!-- </div>-->
44 44 <!--</div>-->
45 45 <div class="form-group">
46   - <label class="col-sm-3 control-label">是否启用：</label>
  46 + <label class="col-sm-3 control-label">是否有效：</label>
47 47 <div class="col-sm-8">
  48 + <!--<input id="enable" name="enable" th:field="*{enable}" class="form-control" type="text">-->
48 49 <div class="onoffswitch">
49   - <input type="checkbox" th:checked="true" class="onoffswitch-checkbox" id="enable" name="enable"
50   - th:field="*{enable}">
  50 + <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
51 51 <label class="onoffswitch-label" for="enable">
52 52 <span class="onoffswitch-inner"></span>
53 53 <span class="onoffswitch-switch"></span>
... ... @@ -65,7 +65,7 @@
65 65 </div>
66 66 <div th:include="include::footer"></div>
67 67 <script type="text/javascript">
68   - var prefix = ctx + "config/receiptType";
  68 + var prefix = ctx + "config/statusFlowHeader";
69 69 $("#form-statusFlowHeader-edit").validate({
70 70 rules:{
71 71 code:{
... ...
src/main/resources/templates/config/statusFlowHeader/statusFlowHeader.html
  View file @b43fa4b
... ... @@ -75,6 +75,8 @@
75 75 var prefix1 = ctx + "config/statusFlowDetail";
76 76 var editFlag = [[${@permission.hasPermi('config:statusFlowHeader:edit')}]];
77 77 var removeFlag = [[${@permission.hasPermi('config:statusFlowHeader:remove')}]];
  78 + var datas = [[${@dict.getType('sys_normal_disable')}]];
  79 +
78 80 $(function() {
79 81 var options = {
80 82 url: prefix + "/list",
... ... @@ -94,11 +96,11 @@
94 96 },
95 97 {
96 98 field : 'code',
97   - title : '状态流'
  99 + title : '编码'
98 100 },
99 101 {
100 102 field : 'name',
101   - title : '状态流名称'
  103 + title : '名称'
102 104 },
103 105 {
104 106 field : 'warehouseCode',
... ... @@ -113,6 +115,14 @@
113 115 title : '类型'
114 116 },
115 117 {
  118 + field : 'enable',
  119 + title : '是否有效' ,
  120 + align: 'center',
  121 + formatter: function(value, row, index) {
  122 + return $.table.selectDictLabel(datas, value);
  123 + }
  124 + },
  125 + {
116 126 field : 'version',
117 127 title : '数据版本',
118 128 visible : false
... ...
src/main/resources/templates/login.html
  View file @b43fa4b
... ... @@ -74,11 +74,11 @@
74 74 </select>
75 75 </div>
76 76 </div>
77   - <!--<div class="row" style="padding:0 10px;">-->
78   - <!--<div class="col-lg-3"></div>-->
79   - <!--<div class="col-lg-9" style="padding:10px 0 0 5px;"><input class="i-checks" type="checkbox" name="rememberme" style="background: #fff"/>&nbsp;&nbsp;记住我-->
80   - <!--</div>-->
81   - <!--</div>-->
  77 + <div class="row" style="padding:0 10px;">
  78 + <div class="col-lg-3"></div>
  79 + <div class="col-lg-9" style="padding:10px 0 0 5px;"><input class="i-checks" type="checkbox" name="rememberme" style="background: #fff"/>&nbsp;&nbsp;记住我
  80 + </div>
  81 + </div>
82 82 <button style="margin-top: 20px" class="btn btn-success btn-block" id="btnSubmit" data-loading="正在验证登录，请稍后...">登录</button>
83 83 </form>
84 84 </div>
... ...
src/main/resources/templates/receipt/receiptDetail/add.html
  View file @b43fa4b
... ... @@ -18,12 +18,6 @@
18 18 <input id="receiptCode" name="receiptCode" class="form-control" type="text" th:value="${receiptCode}" readonly="readonly">
19 19 </div>
20 20 </div>
21   -<!-- <div class="form-group">-->
22   -<!-- <label class="col-sm-3 control-label">上游系统行号：</label>-->
23   -<!-- <div class="col-sm-8">-->
24   -<!-- <input id="sourceLine" name="sourceLine" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')">-->
25   -<!-- </div>-->
26   -<!-- </div>-->
27 21 <div class="form-group">
28 22 <label class="col-sm-3 control-label">物料编码：</label>
29 23 <div class="col-sm-8">
... ... @@ -52,7 +46,7 @@
52 46 <div class="form-group">
53 47 <label class="col-sm-3 control-label">项目号：</label>
54 48 <div class="col-sm-8">
55   - <input id="project" name="project" class="form-control" type="text">
  49 + <input id="projectNo" name="projectNo" class="form-control" type="text">
56 50 </div>
57 51 </div>
58 52 <div class="form-group">
... ... @@ -76,7 +70,7 @@
76 70 <div class="form-group">
77 71 <label class="col-sm-3 control-label">库存状态：</label>
78 72 <div class="col-sm-8">
79   - <select id="inventoryStatus" name="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
  73 + <select id="inventorySts" name="inventorySts" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}">
80 74 <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
81 75 </select>
82 76 </div>
... ... @@ -148,8 +142,7 @@
148 142 },
149 143 submitHandler: function(form) {
150 144 var tableValue = $("#form-receiptDetail-add").serialize();
151   - tableValue = formValueReplace(tableValue, "companyCode", $("#companyCode option:selected").val())
152   - tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  145 + tableValue = formValueReplace(tableValue, "inventorySts", $("#inventorySts option:selected").val());
153 146 $.operate.save(prefix + "/add", tableValue);
154 147 }
155 148 });
... ...
src/main/resources/templates/receipt/receiptDetail/edit.html
  View file @b43fa4b
... ... @@ -3,142 +3,132 @@
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5 5 <body class="white-bg">
6   - <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7   - <form class="form-horizontal m" id="form-receiptDetail-edit" th:object="${receiptDetail}">
8   - <input id="id" name="id" th:field="*{id}" type="hidden">
9   - <div class="form-group">
10   - <label class="col-sm-3 control-label">上游系统行号：</label>
11   - <div class="col-sm-8">
12   - <input id="sourceLine" name="sourceLine" th:field="*{sourceLine}" class="form-control" type="text">
13   - </div>
14   - </div>
15   - <div class="form-group">
16   - <label class="col-sm-3 control-label">入库单id：</label>
17   - <div class="col-sm-8">
18   - <input id="receiptId" name="receiptId" th:field="*{receiptId}" class="form-control" type="text" readonly="readonly" >
19   - </div>
20   - </div>
21   - <div class="form-group">
22   - <label class="col-sm-3 control-label">入库单编码：</label>
23   - <div class="col-sm-8">
24   - <input id="receiptCode" name="receiptCode" th:field="*{receiptCode}" class="form-control" type="text" readonly="readonly" >
25   - </div>
26   - </div>
27   - <div class="form-group">
28   - <label class="col-sm-3 control-label">存货编码：</label>
29   - <div class="col-sm-8">
30   - <input id="materialCode" name="materialCode" th:field="*{materialCode}" class="form-control" type="text">
31   - </div>
32   - </div>
33   - <div class="form-group">
34   - <label class="col-sm-3 control-label">批次：</label>
35   - <div class="col-sm-8">
36   - <input id="batch" name="batch" th:field="*{batch}" class="form-control" type="text">
37   - </div>
38   - </div>
39   - <div class="form-group">
40   - <label class="col-sm-3 control-label">批号：</label>
41   - <div class="col-sm-8">
42   - <input id="lot" name="lot" th:field="*{lot}" class="form-control" type="text">
43   - </div>
44   - </div>
45   - <div class="form-group">
46   - <label class="col-sm-3 control-label">项目号：</label>
47   - <div class="col-sm-8">
48   - <input id="project" name="project" th:field="*{project}" class="form-control" type="text">
49   - </div>
50   - </div>
51   - <div class="form-group">
52   - <label class="col-sm-3 control-label">生产日期：</label>
53   - <div class="col-sm-8">
54   - <input id="manufactureDate" name="manufactureDate" th:field="*{manufactureDate}" class="form-control" type="text">
55   - </div>
56   - </div>
57   - <div class="form-group">
58   - <label class="col-sm-3 control-label">失效日期：</label>
59   - <div class="col-sm-8">
60   - <input id="expirationDate" name="expirationDate" th:field="*{expirationDate}" class="form-control" type="text">
61   - </div>
62   - </div>
63   - <div class="form-group">
64   - <label class="col-sm-3 control-label">库存状态：</label>
65   - <div class="col-sm-8">
66   - <select id="inventoryStatus" name="inventoryStatus" class="form-control" th:with="inventoryStatus=${@dict.getType('inventoryStatus')}" th:field="*{inventoryStatus}">
67   - <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
68   - </select>
69   - </div>
70   - </div>
71   - <div class="form-group">
72   - <label class="col-sm-3 control-label">数量：</label>
73   - <div class="col-sm-8">
74   - <input id="qty" name="qty" th:field="*{qty}" class="form-control" type="text">
75   - </div>
76   - </div>
77   - <div class="form-group">
78   - <label class="col-sm-3 control-label">已收数量：</label>
79   - <div class="col-sm-8">
80   - <input id="qtyCompleted" name="qtyCompleted" th:field="*{qtyCompleted}" class="form-control" type="text" readonly="readonly">
81   - </div>
82   - </div>
83   - <div class="form-group">
84   - <label class="col-sm-3 control-label">单价：</label>
85   - <div class="col-sm-8">
86   - <input id="price" name="price" th:field="*{price}" class="form-control" type="text">
87   - </div>
88   - </div>
89   - <!--<div class="form-group"> -->
90   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
91   - <!--<div class="col-sm-8">-->
92   - <!--<input id="created" name="created" th:field="*{created}" class="form-control" type="text">-->
93   - <!--</div>-->
94   - <!--</div>-->
95   - <!--<div class="form-group"> -->
96   - <!--<label class="col-sm-3 control-label">创建用户：</label>-->
97   - <!--<div class="col-sm-8">-->
98   - <!--<input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text">-->
99   - <!--</div>-->
100   - <!--</div>-->
101   - <!--<div class="form-group"> -->
102   - <!--<label class="col-sm-3 control-label">最后修改时间：</label>-->
103   - <!--<div class="col-sm-8">-->
104   - <!--<input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="form-control" type="text">-->
105   - <!--</div>-->
106   - <!--</div>-->
107   - <!--<div class="form-group"> -->
108   - <!--<label class="col-sm-3 control-label">更新用户：</label>-->
109   - <!--<div class="col-sm-8">-->
110   - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text">-->
111   - <!--</div>-->
112   - <!--</div>-->
113   - <!--<div class="form-group"> -->
114   - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
115   - <!--<div class="col-sm-8">-->
116   - <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
117   - <!--</div>-->
118   - <!--</div>-->
119   - <!--<div class="form-group"> -->
120   - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
121   - <!--<div class="col-sm-8">-->
122   - <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
123   - <!--</div>-->
124   - <!--</div>-->
125   - <!--<div class="form-group"> -->
126   - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
127   - <!--<div class="col-sm-8">-->
128   - <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
129   - <!--</div>-->
130   - <!--</div>-->
131   - <div class="form-group">
132   - <div class="form-control-static col-sm-offset-9">
133   - <button type="submit" class="btn btn-primary">提交</button>
134   - <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
135   - </div>
136   - </div>
137   - </form>
138   - </div>
139   - <div th:include="include::footer"></div>
140   -</body>
141   -<script>
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptDetail-edit" th:object="${receiptDetail}">
  8 + <input id="id" name="id" hidden th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">入库单id：</label>
  11 + <div class="col-sm-8">
  12 + <input id="receiptId" name="receiptId" class="form-control" type="text" th:value="${receiptId}" readonly="readonly" th:field="*{receiptId}">
  13 + <input id="companyCode" name="companyCode" type="hidden" th:value="${companyCode}" th:field="*{companyCode}">
  14 + </div>
  15 + </div>
  16 + <div class="form-group">
  17 + <label class="col-sm-3 control-label">入库单号：</label>
  18 + <div class="col-sm-8">
  19 + <input id="receiptCode" name="receiptCode" class="form-control" type="text" th:value="${receiptCode}" readonly="readonly" th:field="*{receiptCode}">
  20 + </div>
  21 + </div>
  22 + <div class="form-group">
  23 + <label class="col-sm-3 control-label">物料编码：</label>
  24 + <div class="col-sm-8">
  25 + <input id="materialCode" name="materialCode" class="form-control" type="text" onkeyup=" this.value=this.value.replace(/^\s+|\s+$/g,'')" th:field="*{materialCode}">
  26 + </div>
  27 + </div>
  28 + <div class="form-group">
  29 + <label class="col-sm-3 control-label">供应商编码：</label>
  30 + <div class="col-sm-8">
  31 + <input id="supplierCode" name="supplierCode" class="form-control" type="text" th:field="*{supplierCode}">
  32 + </div>
  33 + </div>
  34 + <div class="form-group">
  35 + <label class="col-sm-3 control-label">批次：</label>
  36 + <div class="col-sm-8">
  37 + <input id="batch" name="batch" class="form-control" type="text" th:field="*{batch}">
  38 + </div>
  39 + </div>
  40 +
  41 + <div class="form-group">
  42 + <label class="col-sm-3 control-label">批号：</label>
  43 + <div class="col-sm-8">
  44 + <input id="lot" name="lot" class="form-control" type="text" th:field="*{lot}">
  45 + </div>
  46 + </div>
  47 + <div class="form-group">
  48 + <label class="col-sm-3 control-label">项目号：</label>
  49 + <div class="col-sm-8">
  50 + <input id="projectNo" name="projectNo" class="form-control" type="text" th:field="*{projectNo}">
  51 + </div>
  52 + </div>
  53 + <div class="form-group">
  54 + <label class="col-sm-3 control-label">是否质检：</label>
  55 + <div class="col-sm-8">
  56 + <input id="qcCheck" name="qcCheck" class="form-control" type="text" th:field="*{qcCheck}">
  57 + </div>
  58 + </div>
  59 + <div class="form-group">
  60 + <label class="col-sm-3 control-label">生产日期：</label>
  61 + <div class="col-sm-8">
  62 + <input id="manufactureDate" name="manufactureDate" class="form-control" type="text" th:field="*{manufactureDate}">
  63 + </div>
  64 + </div>
  65 + <div class="form-group">
  66 + <label class="col-sm-3 control-label">失效日期：</label>
  67 + <div class="col-sm-8">
  68 + <input id="expirationDate" name="expirationDate" class="form-control" type="text" th:field="*{expirationDate}">
  69 + </div>
  70 + </div>
  71 + <div class="form-group">
  72 + <label class="col-sm-3 control-label">库存状态：</label>
  73 + <div class="col-sm-8">
  74 + <select id="inventorySts" name="inventorySts" class="form-control"
  75 + th:with="inventoryStatus=${@dict.getType('inventoryStatus')}" th:field="*{inventorySts}">
  76 + <option th:each="dict : ${inventoryStatus}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}"></option>
  77 + </select>
  78 + </div>
  79 + </div>
  80 + <div class="form-group">
  81 + <label class="col-sm-3 control-label">总数量：</label>
  82 + <div class="col-sm-8">
  83 + <input id="totalQty" name="totalQty" class="form-control" type="text" th:field="*{totalQty}">
  84 + </div>
  85 + </div>
  86 + <div class="form-group">
  87 + <label class="col-sm-3 control-label">定位规则：</label>
  88 + <div class="col-sm-8">
  89 + <input id="locatingRule" name="locatingRule" class="form-control" type="text" th:field="*{locatingRule}">
  90 + </div>
  91 + </div>
  92 + <div class="form-group">
  93 + <label class="col-sm-3 control-label">标价：</label>
  94 + <div class="col-sm-8">
  95 + <input id="itemListPrice" name="itemListPrice" class="form-control" type="text" th:field="*{itemListPrice}">
  96 + </div>
  97 + </div>
  98 + <div class="form-group">
  99 + <label class="col-sm-3 control-label">净价：</label>
  100 + <div class="col-sm-8">
  101 + <input id="itemNetPrice" name="itemNetPrice" class="form-control" type="text" th:field="*{itemNetPrice}">
  102 + </div>
  103 + </div>
  104 + <!--<div class="form-group">-->
  105 + <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
  106 + <!--<div class="col-sm-8">-->
  107 + <!--<input id="userDef1" name="userDef1" class="form-control" type="text">-->
  108 + <!--</div>-->
  109 + <!--</div>-->
  110 + <!--<div class="form-group"> -->
  111 + <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
  112 + <!--<div class="col-sm-8">-->
  113 + <!--<input id="userDef2" name="userDef2" class="form-control" type="text">-->
  114 + <!--</div>-->
  115 + <!--</div>-->
  116 + <!--<div class="form-group"> -->
  117 + <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
  118 + <!--<div class="col-sm-8">-->
  119 + <!--<input id="userDef3" name="userDef3" class="form-control" type="text">-->
  120 + <!--</div>-->
  121 + <!--</div>-->
  122 + <div class="form-group">
  123 + <div class="form-control-static col-sm-offset-9">
  124 + <button type="submit" class="btn btn-primary">提交</button>
  125 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
  126 + </div>
  127 + </div>
  128 + </form>
  129 +</div>
  130 +<div th:include="include::footer"></div>
  131 +<script type="text/javascript">
142 132 var prefix = ctx + "receipt/receiptDetail";
143 133 $("#form-receiptDetail-edit").validate({
144 134 rules:{
... ... @@ -151,70 +141,14 @@
151 141 materialCode:{
152 142 required:true
153 143 },
154   - sourceLine:{
155   - required:false,
156   - digits:true
157   - },
158   - qty:{
159   - required:true,
160   - min:0
161   - },
162   - price:{
163   - required:false,
164   - min:0
165   - }
166 144 },
167 145 submitHandler: function(form) {
168   - $.ajax({
169   - cache : true,
170   - type : "POST",
171   - url : prefix + "/edit",
172   - data : {
173   - "id": $("input[name='id']").val(),
174   - "receiptId": $("input[name='receiptId']").val(),
175   - "receiptCode": $("input[name='receiptCode']").val(),
176   - "sourceLine": $("input[name='sourceLine']").val(),
177   - // "materialId": $("input[name='materialId']").val(),
178   - "materialCode": $("input[name='materialCode']").val(),
179   - "batch": $("input[name='batch']").val(),
180   - "lot": $("input[name='lot']").val(),
181   - "project": $("input[name='project']").val(),
182   - "manufactureDate": $("input[name='manufactureDate']").val(),
183   - "expirationDate": $("input[name='expirationDate']").val(),
184   - "inventoryStatus": $("#inventoryStatus option:selected").val(),
185   - "qty": $("input[name='qty']").val(),
186   - "price": $("input[name='price']").val()
187   - // "userDef1": $("input[name='userDef1']").val(),
188   - // "userDef2": $("input[name='userDef2']").val(),
189   - // "userDef3": $("input[name='userDef3']").val()
190   - },
191   - async : false,
192   - error : function(request) {
193   - $.modal.alertError("请求失败！");
194   - },
195   - success : function(data) {
196   - // $.operate.saveSuccess(data);
197   - // console.log(data);
198   - ajaxSuccess(data);
199   - }
200   - });
  146 + var tableValue = $("#form-receiptDetail-edit").serialize();
  147 + tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
  148 + $.operate.save(prefix + "/edit", tableValue);
201 149 }
202 150 });
203 151  
204   - function ajaxSuccess(result) {
205   - if (result.code == web_status.SUCCESS) {
206   - $.modal.msgSuccess(result.msg);
207   - var index = parent.layer.getFrameIndex(window.name);
208   - parent.layer.close(index);
209   - window.parent.loadDetail(id,code);
210   - } else {
211   - $.modal.alertError(result.msg);
212   - }
213   - $.modal.closeLoading();
214   - }
215   -
216   - var id=$("input[name='receiptId']").val();
217   - var code=$("input[name='receiptCode']").val();
218 152 $(function () {
219 153 layui.use('laydate', function() {
220 154 var laydate = layui.laydate;
... ... @@ -223,6 +157,6 @@
223 157 });
224 158 });
225 159  
226   -
227 160 </script>
  161 +</body>
228 162 </html>
... ...
src/main/resources/templates/receipt/receiptHeader/edit.html
  View file @b43fa4b
... ... @@ -2,196 +2,93 @@
2 2 <html lang="zh" xmlns:th="http://www.thymeleaf.org">
3 3 <meta charset="utf-8">
4 4 <head th:include="include :: header"></head>
5   -
6 5 <body class="white-bg">
7   - <div class="wrapper wrapper-content animated fadeInRight ibox-content">
8   - <form class="form-horizontal m" id="form-receiptHeader-edit" th:object="${receiptHeader}">
9   - <input id="id" name="id" th:field="*{id}" type="hidden">
10   - <div class="form-group">
11   - <label class="col-sm-3 control-label">入库单号：</label>
12   - <div class="col-sm-8">
13   - <input id="code" name="code" th:field="*{code}" class="form-control" type="text" readonly="readonly">
14   - </div>
15   - </div>
16   - <div class="form-group">
17   - <label class="col-sm-3 control-label">货主：</label>
18   - <div class="col-sm-8">
19   - <select id="company" name="company" class="form-control" th:with="list=${@company.selectCompanyByCurrentUserId()}" th:field="*{companyId}" readonly="true" disabled="disabled">
20   - <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr="code = ${item['code']}"></option>
21   - </select>
22   - </div>
23   - </div>
24   - <div class="form-group">
25   - <label class="col-sm-3 control-label">入库类型：</label>
26   - <div class="col-sm-8">
27   - <select id="type" name="type" class="form-control" th:with="receiptHeaderType=${@receiptTypeService.getType()}" th:field="*{receiptType}">
28   - <option th:each="dict : ${receiptHeaderType}" th:text="${dict['name']}" th:value="${dict['code']}"></option>
29   - </select>
30   - </div>
31   - </div>
32   - <div class="form-group">
33   - <label class="col-sm-3 control-label">上游系统单号：</label>
34   - <div class="col-sm-8">
35   - <input id="sourceCode" name="sourceCode" th:field="*{sourceCode}" class="form-control" type="text">
36   - </div>
  6 +<div class="wrapper wrapper-content animated fadeInRight ibox-content">
  7 + <form class="form-horizontal m" id="form-receiptHeader-edit" th:object="${receiptHeader}">
  8 + <input id="id" name="id" type="hidden" th:field="*{id}">
  9 + <div class="form-group">
  10 + <label class="col-sm-3 control-label">入库类型：</label>
  11 + <div class="col-sm-8">
  12 + <select id="receiptType" name="receiptType" class="form-control"
  13 + th:with="receiptHeaderType=${@receiptTypeService.getType()}" th:field="*{receiptType}">
  14 + <option th:each="dict : ${receiptHeaderType}" th:text="${dict['name']}" th:value="${dict['code']}"></option>
  15 + </select>
37 16 </div>
38   - <div class="form-group">
39   - <label class="col-sm-3 control-label">上游平台：</label>
40   - <div class="col-sm-8">
41   - <input id="sourcePlatform" name="sourcePlatform" th:field="*{sourcePlatform}" class="form-control" type="text">
42   - </div>
  17 + </div>
  18 + <div class="form-group">
  19 + <label class="col-sm-3 control-label">货主：</label>
  20 + <div class="col-sm-8">
  21 + <select id="companyCode" name="companyCode" class="form-control" th:with="list=${@companyService.getCode()}" th:field="*{companyCode}">
  22 + <option th:each="item : ${list}" th:text="${item['name']}" th:value="${item['id']}" th:attr = " code = ${item['code']}"></option>
  23 + </select>
43 24 </div>
44   - <div class="form-group">
45   - <label class="col-sm-3 control-label">供应商编码：</label>
46   - <div class="col-sm-8">
47   - <select id="supplierCode" name="supplierCode" class="form-control" th:with="supplier=${@Supplier.getSupplierCode()}" th:field="*{supplierCode}">
48   - <option th:each="dict : ${supplier}" th:text="${dict['name']}" th:value="${dict['code']}"></option>
49   - </select>
50   - </div>
  25 + </div>
  26 + <div class="form-group">
  27 + <label class="col-sm-3 control-label">入库单备注：</label>
  28 + <div class="col-sm-8">
  29 + <input id="receiptNote" name="receiptNote" class="form-control" type="text" th:field="*{receiptType}">
51 30 </div>
52   - <!--<div class="form-group">-->
53   - <!--<label class="col-sm-3 control-label">总数量：</label>-->
54   - <!--<div class="col-sm-8">-->
55   - <!--<input id="totalQty" name="totalQty" th:field="*{totalQty}" class="form-control" type="text">-->
56   - <!--</div>-->
57   - <!--</div>-->
58   - <!--<div class="form-group"> -->
59   - <!--<label class="col-sm-3 control-label">总行数：</label>-->
60   - <!--<div class="col-sm-8">-->
61   - <!--<input id="totalLines" name="totalLines" th:field="*{totalLines}" class="form-control" type="text">-->
62   - <!--</div>-->
63   - <!--</div>-->
64   - <div class="form-group">
65   - <label class="col-sm-3 control-label">入库单备注：</label>
66   - <div class="col-sm-8">
67   - <input id="remark" name="remark" th:field="*{remark}" class="form-control" type="text">
68   - </div>
  31 + </div>
  32 + <div class="form-group">
  33 + <label class="col-sm-3 control-label">预计到达时间：</label>
  34 + <div class="col-sm-8">
  35 + <input id="scheduledArriveDate" name="scheduledArriveDate" class="form-control" type="text" th:field="*{scheduledArriveDate}">
69 36 </div>
70   - <!--<div class="form-group"> -->
71   - <!--<label class="col-sm-3 control-label">upload状态：</label>-->
72   - <!--<div class="col-sm-8">-->
73   - <!--<input id="uploadStatus" name="uploadStatus" th:field="*{uploadStatus}" class="form-control" type="text" readonly="true">-->
74   - <!--</div>-->
75   - <!--</div>-->
76   - <!--<div class="form-group"> -->
77   - <!--<label class="col-sm-3 control-label">上传备注：</label>-->
78   - <!--<div class="col-sm-8">-->
79   - <!--<input id="uploadremark" name="uploadremark" th:field="*{uploadremark}" class="form-control" type="text" readonly="true">-->
80   - <!--</div>-->
81   - <!--</div>-->
82   - <!--<div class="form-group"> -->
83   - <!--<label class="col-sm-3 control-label">上传时间：</label>-->
84   - <!--<div class="col-sm-8">-->
85   - <!--<input id="uploadTime" name="uploadTime" th:field="*{uploadTime}" class="time-input" type="text" readonly="true">-->
86   - <!--</div>-->
87   - <!--</div>-->
88   - <div class="form-group">
89   - <label class="col-sm-3 control-label">入库预约时间：</label>
90   - <div class="col-sm-8">
91   - <input id="appointmentTime" name="appointmentTime" th:field="*{appointmentTime}" class="form-control" type="text">
92   - </div>
  37 + </div>
  38 + <div class="form-group">
  39 + <div class="form-control-static col-sm-offset-9">
  40 + <button type="submit" class="btn btn-primary">提交</button>
  41 + <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
93 42 </div>
94   - <!--<div class="form-group"> -->
95   - <!--<label class="col-sm-3 control-label">单据头状态：</label>-->
96   - <!--<div class="col-sm-8">-->
97   - <!--&lt;!&ndash;<input id="firstStatus" name="firstStatus" th:field="*{firstStatus}" class="form-control" type="text" readonly="true">&ndash;&gt;-->
98   - <!--<select id="firstStatus" class="form-control m-b" th:with="status=${@dict.getType('receiptHeaderStatus')}">-->
99   - <!--<option th:each="dict : ${status}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{firstStatus}"></option>-->
100   - <!--</select>-->
101   - <!--</div>-->
102   - <!--</div>-->
103   - <!--<div class="form-group"> -->
104   - <!--<label class="col-sm-3 control-label">单据尾状态：</label>-->
105   - <!--<div class="col-sm-8">-->
106   - <!--&lt;!&ndash;<input id="lastStatus" name="lastStatus" th:field="*{lastStatus}" class="form-control" type="text" readonly="true">&ndash;&gt;-->
107   - <!--<select id="lastStatus" class="form-control m-b" th:with="status=${@dict.getType('receiptHeaderStatus')}">-->
108   - <!--<option th:each="dict : ${status}" th:text="${dict['dictLabel']}" th:value="${dict['dictValue']}" th:field="*{lastStatus}"></option>-->
109   - <!--</select>-->
110   - <!--</div>-->
111   - <!--</div>-->
112   - <!--<div class="form-group"> -->
113   - <!--<label class="col-sm-3 control-label">创建时间：</label>-->
114   - <!--<div class="col-sm-8">-->
115   - <!--<input id="created" name="created" th:field="*{created}" class="time-input" type="text" readonly="true">-->
116   - <!--</div>-->
117   - <!--</div>-->
118   - <!--<div class="form-group"> -->
119   - <!--<label class="col-sm-3 control-label">创建用户：</label>-->
120   - <!--<div class="col-sm-8">-->
121   - <!--<input id="createdBy" name="createdBy" th:field="*{createdBy}" class="form-control" type="text" readonly="true">-->
122   - <!--</div>-->
123   - <!--</div>-->
124   - <!--<div class="form-group"> -->
125   - <!--<label class="col-sm-3 control-label">最后修改时间：</label>-->
126   - <!--<div class="col-sm-8">-->
127   - <!--<input id="lastUpdated" name="lastUpdated" th:field="*{lastUpdated}" class="time-input" type="text" readonly="true">-->
128   - <!--</div>-->
129   - <!--</div>-->
130   - <!--<div class="form-group"> -->
131   - <!--<label class="col-sm-3 control-label">更新用户：</label>-->
132   - <!--<div class="col-sm-8">-->
133   - <!--<input id="lastUpdatedBy" name="lastUpdatedBy" th:field="*{lastUpdatedBy}" class="form-control" type="text" readonly="true">-->
134   - <!--</div>-->
135   - <!--</div>-->
136   - <div class="form-group">
137   - <label class="col-sm-3 control-label">是否有效：</label>
138   - <div class="col-sm-8">
139   - <div class="onoffswitch">
140   - <input type="checkbox" th:checked="*{enable}" class="onoffswitch-checkbox" id="enable" name="enable">
141   - <label class="onoffswitch-label" for="enable">
142   - <span class="onoffswitch-inner"></span>
143   - <span class="onoffswitch-switch"></span>
144   - </label>
145   - </div>
146   - </div>
147   - </div>
148   - <!--<div class="form-group"> -->
149   - <!--<label class="col-sm-3 control-label">自定义字段1：</label>-->
150   - <!--<div class="col-sm-8">-->
151   - <!--<input id="userDef1" name="userDef1" th:field="*{userDef1}" class="form-control" type="text">-->
152   - <!--</div>-->
153   - <!--</div>-->
154   - <!--<div class="form-group"> -->
155   - <!--<label class="col-sm-3 control-label">自定义字段2：</label>-->
156   - <!--<div class="col-sm-8">-->
157   - <!--<input id="userDef2" name="userDef2" th:field="*{userDef2}" class="form-control" type="text">-->
158   - <!--</div>-->
159   - <!--</div>-->
160   - <!--<div class="form-group"> -->
161   - <!--<label class="col-sm-3 control-label">自定义字段3：</label>-->
162   - <!--<div class="col-sm-8">-->
163   - <!--<input id="userDef3" name="userDef3" th:field="*{userDef3}" class="form-control" type="text">-->
164   - <!--</div>-->
165   - <!--</div>-->
166   - <div class="form-group">
167   - <div class="form-control-static col-sm-offset-9">
168   - <button type="submit" class="btn btn-primary">提交</button>
169   - <button onclick="$.modal.close()" class="btn btn-danger" type="button">关闭</button>
170   - </div>
171   - </div>
172   - </form>
173   - </div>
174   - <div th:include="include::footer"></div>
175   - <script type="text/javascript">
176   - var prefix = ctx + "receipt/receiptHeader";
177   -
178   - $("#form-receiptHeader-edit").validate({
179   - submitHandler: function(form) {
180   - // var tableValue = $.common.getTableValue("#form-receiptHeader-edit");
181   - var tableValue = $("#form-receiptHeader-edit").serialize();
182   - tableValue = formValueReplace(tableValue, "enable", $("input[name='enable']").is(':checked'));
183   - tableValue = formValueReplace(tableValue, "companyId", $("#company option:selected").val());
184   - tableValue = formValueReplace(tableValue, "companyCode", $("#company option:selected").attr("code"));
185   - $.operate.save(prefix + "/edit", tableValue);
186   - }
187   - });
  43 + </div>
  44 + </form>
  45 +</div>
  46 +<div th:include="include::footer"></div>
  47 +<script type="text/javascript">
  48 + var prefix = ctx + "receipt/receiptHeader";
188 49  
189   - $(function () {
190   - layui.use('laydate', function() {
191   - var laydate = layui.laydate;
192   - laydate.render({ elem: '#appointmentTime', min:0 ,theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss'});
  50 + $("#form-receiptHeader-edit").validate({
  51 + rules:{
  52 + receiptType:{
  53 + required:true,
  54 + },
  55 + companyCode:{
  56 + required:true,
  57 + },
  58 + scheduledArriveDate:{
  59 + required:true,
  60 + }
  61 + },
  62 + submitHandler: function(form) {
  63 + $.ajax({
  64 + cache : true,
  65 + type : "POST",
  66 + url : prefix + "/edit",
  67 + data : {
  68 + "id": $("#id").val(),
  69 + "receiptType": $("#receiptType option:selected").val(),
  70 + "companyCode": $("#company option:selected").attr("code"),
  71 + "receiptNote": $("input[name='receiptNote']").val(),
  72 + "scheduledArriveDate": $("input[name='scheduledArriveDate']").val(),
  73 + },
  74 + async : false,
  75 + error : function(request) {
  76 + $.modal.alertError("请求失败！");
  77 + },
  78 + success : function(data) {
  79 + $.operate.saveSuccess(data);
  80 + }
193 81 });
194   - })
195   - </script>
  82 + }
  83 + });
  84 +
  85 + $(function () {
  86 + layui.use('laydate', function() {
  87 + var laydate = layui.laydate;
  88 + laydate.render({ elem: '#scheduledArriveDate',min: 0, theme: 'molv', format: 'yyyy-MM-dd HH:mm:ss'});
  89 + });
  90 + })
  91 +
  92 +</script>
196 93 </body>
197 94 </html>
... ...
src/main/resources/templates/system/dict/data/add.html
  View file @b43fa4b
... ... @@ -5,7 +5,7 @@
5 5 <body class="white-bg">
6 6 <div class="wrapper wrapper-content animated fadeInRight ibox-content">
7 7 <form class="form-horizontal m" id="form-dict-add">
8   - <input class="form-control" type="text" name="headerId" id="headerId" th:value="${dictType.id}" />
  8 + <input class="form-control" type="hidden" name="headerId" id="headerId" th:value="${dictType.id}" />
9 9 <div class="form-group">
10 10 <label class="col-sm-3 control-label ">字典标签：</label>
11 11 <div class="col-sm-8">
... ...