Commit 810f152b by zhanglt

出库表调整,自动带入操作人、出库单号

parent 00f7e678
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
a.remarks AS "remarks", a.remarks AS "remarks",
ledgerInfo.name AS "ledgerInfo.name", ledgerInfo.name AS "ledgerInfo.name",
ledgerInfo.code AS "ledgerInfo.code", ledgerInfo.code AS "ledgerInfo.code",
ledgerInfo.type_id AS "ledgerInfo.typeId", ledgerInfo.type_id AS "ledgerInfo.type.id",
tpye.name AS "ledgerInfo.type.name",
ledgerInfo.model AS "ledgerInfo.model", ledgerInfo.model AS "ledgerInfo.model",
ledgerInfo.amount AS "ledgerInfo.amount", ledgerInfo.amount AS "ledgerInfo.amount",
a.del_flag AS "delFlag" a.del_flag AS "delFlag"
...@@ -21,6 +22,7 @@ ...@@ -21,6 +22,7 @@
<sql id="outboundInfoJoins"> <sql id="outboundInfoJoins">
left join t_wh_ledger_info ledgerInfo on a.ledger_info_id = ledgerInfo.id left join t_wh_ledger_info ledgerInfo on a.ledger_info_id = ledgerInfo.id
LEFT JOIN t_wh_material_type tpye ON ledgerInfo.type_id = tpye.id
</sql> </sql>
......
...@@ -5,11 +5,13 @@ package com.jeeplus.modules.warehouse.outbound.web; ...@@ -5,11 +5,13 @@ package com.jeeplus.modules.warehouse.outbound.web;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import javax.validation.ConstraintViolationException; import javax.validation.ConstraintViolationException;
import com.jeeplus.modules.sys.utils.UserUtils;
import org.apache.shiro.authz.annotation.Logical; import org.apache.shiro.authz.annotation.Logical;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -86,6 +88,14 @@ public class OutboundController extends BaseController { ...@@ -86,6 +88,14 @@ public class OutboundController extends BaseController {
@RequiresPermissions(value={"warehouse:outbound:outbound:view","warehouse:outbound:outbound:add","warehouse:outbound:outbound:edit"},logical=Logical.OR) @RequiresPermissions(value={"warehouse:outbound:outbound:view","warehouse:outbound:outbound:add","warehouse:outbound:outbound:edit"},logical=Logical.OR)
@RequestMapping(value = "form/{mode}") @RequestMapping(value = "form/{mode}")
public String form(@PathVariable String mode, Outbound outbound, Model model) { public String form(@PathVariable String mode, Outbound outbound, Model model) {
if(Objects.equals(mode, "add")){
if(outbound.getNumber() == null || Objects.equals(outbound.getNumber(), "")){
outbound.setNumber(outboundService.createCKDH());
}
if(outbound.getOperator() == null){
outbound.setOperator(UserUtils.getUser());
}
}
model.addAttribute("outbound", outbound); model.addAttribute("outbound", outbound);
model.addAttribute("mode", mode); model.addAttribute("mode", mode);
return "modules/warehouse/outbound/outboundForm"; return "modules/warehouse/outbound/outboundForm";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment