入库部分和接口
This commit is contained in:
@@ -91,7 +91,7 @@ public class PdaController extends BaseController {
|
|||||||
@RequestMapping("/tpIn")
|
@RequestMapping("/tpIn")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
|
public AjaxResult tpIn(@RequestBody TrayCodeMsg trayCodeMsg) {
|
||||||
return pdaService.tpIn(trayCodeMsg.getTrayCode());
|
return pdaService.tpIn(trayCodeMsg);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -19,6 +19,16 @@ private String stockinDetailId;
|
|||||||
private String inOut;
|
private String inOut;
|
||||||
private String status;
|
private String status;
|
||||||
|
|
||||||
|
private String trayType;
|
||||||
|
|
||||||
|
public String getTrayType() {
|
||||||
|
return trayType;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setTrayType(String trayType) {
|
||||||
|
this.trayType = trayType;
|
||||||
|
}
|
||||||
|
|
||||||
public String getStatus() {
|
public String getStatus() {
|
||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ public interface PdaService {
|
|||||||
|
|
||||||
AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure);
|
AjaxResult bindTray(TrayCodeMakeSure trayCodeMakeSure);
|
||||||
|
|
||||||
AjaxResult tpIn(String trayCode);
|
AjaxResult tpIn(TrayCodeMsg trayCodeMsg);
|
||||||
|
|
||||||
AjaxResult tpOut(TrayCodeMsg trayCodeMsg);
|
AjaxResult tpOut(TrayCodeMsg trayCodeMsg);
|
||||||
|
|
||||||
|
|||||||
@@ -139,9 +139,11 @@ public class PdaServiceImp implements PdaService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public AjaxResult tpIn(String trayCode) {
|
public AjaxResult tpIn(TrayCodeMsg trayCodeMsg) {
|
||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("v_tray_code", trayCode);
|
map.put("v_tray_code", trayCodeMsg.getTrayCode());
|
||||||
|
map.put("v_tray_type", trayCodeMsg.getTrayType());
|
||||||
|
map.put("v_quantity", Integer.valueOf(trayCodeMsg.getInQuantity()));
|
||||||
pdaMapper.tpIn(map);
|
pdaMapper.tpIn(map);
|
||||||
if(!"10".equals(map.get("v_result").toString())){
|
if(!"10".equals(map.get("v_result").toString())){
|
||||||
return AjaxResult.error(map.get("v_resultmsg").toString());
|
return AjaxResult.error(map.get("v_resultmsg").toString());
|
||||||
@@ -155,7 +157,7 @@ public class PdaServiceImp implements PdaService {
|
|||||||
public AjaxResult tpOut(TrayCodeMsg trayCodeMsg) {
|
public AjaxResult tpOut(TrayCodeMsg trayCodeMsg) {
|
||||||
|
|
||||||
HashMap<String, Object> map = new HashMap<>();
|
HashMap<String, Object> map = new HashMap<>();
|
||||||
map.put("v_exit_id", trayCodeMsg.getExitId());
|
map.put("v_tray_type", trayCodeMsg.getTrayType());
|
||||||
pdaMapper.tpOut(map);
|
pdaMapper.tpOut(map);
|
||||||
if(!"10".equals(map.get("v_result").toString())){
|
if(!"10".equals(map.get("v_result").toString())){
|
||||||
return AjaxResult.error(map.get("v_resultmsg").toString());
|
return AjaxResult.error(map.get("v_resultmsg").toString());
|
||||||
|
|||||||
@@ -17,6 +17,8 @@
|
|||||||
<select id="tpIn" parameterType="java.util.Map" statementType="CALLABLE">
|
<select id="tpIn" parameterType="java.util.Map" statementType="CALLABLE">
|
||||||
{call proc_tp_in(
|
{call proc_tp_in(
|
||||||
#{v_tray_code,mode=IN,jdbcType=VARCHAR},
|
#{v_tray_code,mode=IN,jdbcType=VARCHAR},
|
||||||
|
#{v_tray_type,mode=IN,jdbcType=VARCHAR},
|
||||||
|
#{v_quantity,mode=IN,jdbcType=INTEGER},
|
||||||
#{v_result,mode=OUT,jdbcType=INTEGER},
|
#{v_result,mode=OUT,jdbcType=INTEGER},
|
||||||
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
|
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
|
||||||
)}
|
)}
|
||||||
@@ -25,7 +27,7 @@
|
|||||||
<select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
|
<select id="tpOut" parameterType="java.util.Map" statementType="CALLABLE">
|
||||||
{call proc_tp_out(
|
{call proc_tp_out(
|
||||||
|
|
||||||
#{v_exit_id,mode=IN,jdbcType=VARCHAR},
|
#{v_tray_type,mode=IN,jdbcType=VARCHAR},
|
||||||
#{v_result,mode=OUT,jdbcType=INTEGER},
|
#{v_result,mode=OUT,jdbcType=INTEGER},
|
||||||
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
|
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
|
||||||
)}
|
)}
|
||||||
|
|||||||
Reference in New Issue
Block a user