lhq/FT501-WMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
lsymicc
2025-06-06 11:57:48 +08:00
parent 87527e4c47 8eecfa8aac
commit bb7f0357a1
21 changed files with 1476 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/controller/BasWarehouseController.java
View File

@@ -96,4 +96,15 @@ public class BasWarehouseController extends BaseController
{ {
return toAjax(basWarehouseService.deleteBasWarehouseByWarehouseIds(warehouseIds)); return toAjax(basWarehouseService.deleteBasWarehouseByWarehouseIds(warehouseIds));
} }
/**
* 获取除了CTU以外的库
*/
@RequestMapping("/getWarehouseByType")
@ResponseBody
public AjaxResult getWarehouseByType()
{
List<BasWarehouse> list = basWarehouseService.selectBasWarehouseListByType();
return AjaxResult.success(list);
}
} }

6
ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/mapper/BasWarehouseMapper.java
View File

@@ -59,4 +59,10 @@ public interface BasWarehouseMapper
* @return 结果 * @return 结果
*/ */
public int deleteBasWarehouseByWarehouseIds(String[] warehouseIds); public int deleteBasWarehouseByWarehouseIds(String[] warehouseIds);
/**
*
*/
public List<BasWarehouse> selectBasWarehouseListByType();
} }

5
ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/IBasWarehouseService.java
View File

@@ -59,4 +59,9 @@ public interface IBasWarehouseService
* @return 结果 * @return 结果
*/ */
public int deleteBasWarehouseByWarehouseId(String warehouseId); public int deleteBasWarehouseByWarehouseId(String warehouseId);
/**
*
*/
public List<BasWarehouse> selectBasWarehouseListByType();
} }

9
ruoyi-admin/src/main/java/com/ruoyi/bas/warehouse/service/impl/BasWarehouseServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.ruoyi.bas.warehouse.service.IBasWarehouseService;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.Collections;
import java.util.List; import java.util.List;
/** /**
@@ -91,4 +92,12 @@ public class BasWarehouseServiceImpl implements IBasWarehouseService
{ {
return basWarehouseMapper.deleteBasWarehouseByWarehouseId(warehouseId); return basWarehouseMapper.deleteBasWarehouseByWarehouseId(warehouseId);
} }
/**
*
*/
@Override
public List<BasWarehouse> selectBasWarehouseListByType() {
return basWarehouseMapper.selectBasWarehouseListByType();
}
} }

39
ruoyi-admin/src/main/java/com/ruoyi/out/outStockout/domain/OutStockout.java
View File

@@ -81,6 +81,45 @@ public class OutStockout extends BaseEntity
@Excel(name = "确认时间") @Excel(name = "确认时间")
private String finishDate; private String finishDate;
private String customerName;
private String warehouseName;
private String productId;
private String productName;
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getProductName() {
return productName;
}
public void setProductName(String productName) {
this.productName = productName;
}
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getStartDate() { public String getStartDate() {
return startDate; return startDate;

21
ruoyi-admin/src/main/java/com/ruoyi/out/outStockoutFinish/domain/OutStockoutFinish.java
View File

@@ -83,6 +83,27 @@ public class OutStockoutFinish extends BaseEntity
@Excel(name = "完成时间") @Excel(name = "完成时间")
private String finishDate; private String finishDate;
private String customerName;
private String warehouseName;
public String getCustomerName() {
return customerName;
}
public void setCustomerName(String customerName) {
this.customerName = customerName;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public void setStockoutGuid(String stockoutGuid) public void setStockoutGuid(String stockoutGuid)
{ {
this.stockoutGuid = stockoutGuid; this.stockoutGuid = stockoutGuid;

59
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java Normal file
View File

@@ -0,0 +1,59 @@
package com.ruoyi.pda.controller;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.in.stockin.domain.InStockin;
import com.ruoyi.in.stockin.service.IInStockinService;
import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.service.PdaService;
import io.swagger.v3.oas.annotations.parameters.RequestBody;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List;
import static com.ruoyi.common.utils.PageUtils.startPage;
@Controller
@RequestMapping("/pda")
public class PdaController extends BaseController {
@Autowired
private PdaService pdaService;
@Autowired
private IInStockinService inStockinService;
/**
* 空托盘入库
* @param trayCodeMsg
* @return
*/
@RequestMapping("/emptyTrayIn")
@ResponseBody
public AjaxResult emptyTrayIn(@RequestBody TrayCodeMsg trayCodeMsg) {
AjaxResult ajaxResult = pdaService.emptyTrayIn(trayCodeMsg);
return ajaxResult;
}
/**
* 空料箱入库
*/
@RequestMapping("/emptyBoxIn")
@ResponseBody
public AjaxResult emptyBoxIn(@RequestBody TrayCodeMsg trayCodeMsg) {
AjaxResult ajaxResult = pdaService.emptyBoxIn(trayCodeMsg);
return ajaxResult;
}
@RequestMapping("/inorder/list")
@ResponseBody
public TableDataInfo inoderList(InStockin stockin) {
startPage();
List<InStockin> stockins = inStockinService.selectInStockinList(stockin);
return getDataTable(stockins);
}
}

44
ruoyi-admin/src/main/java/com/ruoyi/pda/domain/TrayCodeMsg.java Normal file
View File

@@ -0,0 +1,44 @@
package com.ruoyi.pda.domain;
public class TrayCodeMsg {
private String trayCode;
private String warehouseId;
private String quantity;
private String entranceId;
public String getEntranceId() {
return entranceId;
}
public void setEntranceId(String entranceId) {
this.entranceId = entranceId;
}
public String getTrayCode() {
return trayCode;
}
public void setTrayCode(String trayCode) {
this.trayCode = trayCode;
}
public String getWarehouseId() {
return warehouseId;
}
public void setWarehouseId(String warehouseId) {
this.warehouseId = warehouseId;
}
public String getQuantity() {
return quantity;
}
public void setQuantity(String quantity) {
this.quantity = quantity;
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/pda/mapper/PdaMapper.java Normal file
View File

@@ -0,0 +1,10 @@
package com.ruoyi.pda.mapper;
import java.util.HashMap;
public interface PdaMapper {
void emptyTrayIn(HashMap<String, Object> map);
void emptyBoxIn(HashMap<String, Object> map);
}

11
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaService.java Normal file
View File

@@ -0,0 +1,11 @@
package com.ruoyi.pda.service;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pda.domain.TrayCodeMsg;
public interface PdaService {
public AjaxResult emptyTrayIn(TrayCodeMsg trayCodeMsg);
public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg);
}

67
ruoyi-admin/src/main/java/com/ruoyi/pda/service/PdaServiceImp.java Normal file
View File

@@ -0,0 +1,67 @@
package com.ruoyi.pda.service;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.pda.domain.TrayCodeMsg;
import com.ruoyi.pda.mapper.PdaMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
@Service
public class PdaServiceImp implements PdaService{
@Autowired
PdaMapper pdaMapper;
@Autowired
IBasCargoSpaceService basCargoSpaceService;
/**
* 空托盘入库
* @param trayCodeMsg
* @return
*/
@Override
public AjaxResult emptyTrayIn(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_warehouse_id", trayCodeMsg.getWarehouseId());
map.put("v_quantity", "1");
pdaMapper.emptyTrayIn(map);
String result = (String) map.get("v_result");
String cargoSpaceId = map.get("v_cargo_space_id").toString();
if(StrUtil.isNotEmpty(cargoSpaceId)){
BasCargoSpace basCargoSpace = basCargoSpaceService.selectBasCargoSpaceByCargoSpaceId(cargoSpaceId);
map.put("v_cargo_space_id", basCargoSpace.getCargoSpaceName());
}
if("10".equals(result)){
return AjaxResult.success(map);
}else{
return AjaxResult.error(map.get("v_resultmsg").toString());
}
}
/**
* 空料箱入库
* @param trayCodeMsg
* @return
*/
@Override
public AjaxResult emptyBoxIn(TrayCodeMsg trayCodeMsg) {
HashMap<String, Object> map = new HashMap<>();
map.put("v_tray_code", trayCodeMsg.getTrayCode());
map.put("v_entrance_id", trayCodeMsg.getEntranceId());
pdaMapper.emptyBoxIn(map);
String result = (String) map.get("v_result");
if("10".equals(result)){
return AjaxResult.success(map.get("v_resultmsg").toString());
}else{
return AjaxResult.error(map.get("v_resultmsg").toString());
}
}
}

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@@ -253,4 +253,6 @@ public class SysUserController extends BaseController
{ {
return success(deptService.selectDeptTreeList(dept)); return success(deptService.selectDeptTreeList(dept));
} }
} }

5
ruoyi-admin/src/main/resources/mapper/bas/warehouse/BasWarehouseMapper.xml
View File

@@ -91,4 +91,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{warehouseId} #{warehouseId}
</foreach> </foreach>
</delete> </delete>
<select id="selectBasWarehouseListByType" resultMap="BasWarehouseResult">
<include refid="selectBasWarehouseVo"/>
where warehouse_type in (1,3)
</select>
</mapper> </mapper>

6
ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailFinishMapper.xml
View File

@@ -206,7 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailFinishResult"> <select id="selectOutStockoutDetailFinishListByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailFinishResult">
<include refid="selectOutStockoutDetailFinishVo"/> select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
d.erp_stockout_id, d.unit, d.spec, p.product_name, d.supplier_id, d.cargo_no, d.create_time, d.print_date from out_stockout_detail_finish d
left join bas_product p on d.product_id = p.product_id
where stockout_guid = #{stockoutGuid} where stockout_guid = #{stockoutGuid}
</select> </select>
</mapper> </mapper>

8
ruoyi-admin/src/main/resources/mapper/out/OutStockoutDetailMapper.xml
View File

@@ -206,7 +206,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<select id="selectOutStockoutDetailByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult"> <select id="selectOutStockoutDetailByStockoutGuid" parameterType="string" resultMap="OutStockoutDetailResult">
<include refid="selectOutStockoutDetailVo"/> select d.stockout_detail_id, d.stockout_guid, d.stockout_id, d.lot_no, d.product_guid, d.product_id, d.quantity, d.quantity_x,
where stockout_guid = #{stockoutGuid} d.quantity_j, d.assign_num, d.assign_num_x, d.assign_num_j, d.allot_quantity, d.allot_quantity_x, d.allot_quantity_j,
d.price, d.remark, d.warehouse_id, d.out_id, d.bukechai_quantity, d.kechai_quantity, d.entryid, d.flat_quantity, d.fid,
d.erp_stockout_id, d.unit, d.spec, p.product_name, d.supplier_id, d.cargo_no, d.create_time, d.print_date from out_stockout_detail d
left join bas_product p on d.product_id = p.product_id
where d.stockout_guid = #{stockoutGuid}
</select> </select>
</mapper> </mapper>

45
ruoyi-admin/src/main/resources/mapper/out/OutStockoutFinishMapper.xml
View File

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpStockoutId" column="erp_stockout_id" /> <result property="erpStockoutId" column="erp_stockout_id" />
<result property="startDate" column="start_date" /> <result property="startDate" column="start_date" />
<result property="finishDate" column="finish_date" /> <result property="finishDate" column="finish_date" />
<result property="warehouseName" column="warehouse_name" />
<result property="customerName" column="customer_name" />
</resultMap> </resultMap>
<sql id="selectOutStockoutFinishVo"> <sql id="selectOutStockoutFinishVo">
@@ -133,25 +135,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</delete> </delete>
<select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult"> <select id="selectOutStockoutFinishListByOutStockout" parameterType="OutStockout" resultMap="OutStockoutFinishResult">
<include refid="selectOutStockoutFinishVo"/> select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name from out_stockout_finish o
left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
left join bas_customer bc on bc.customer_no = o.customer_no
left join out_stockout_detail_finish d on d.stockout_id = o.stockout_id
left join bas_product bp on bp.product_id = d.product_id
<where> <where>
<if test="stockoutGuid != null and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if> <if test="stockoutGuid != null and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id = #{stockoutId}</if> <if test="stockoutId != null and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
<if test="outType != null and outType != ''"> and out_type = #{outType}</if> <if test="outType != null and outType != ''"> and o.out_type = #{outType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if> <if test="departmentNo != null and departmentNo != ''"> and o.department_no = #{departmentNo}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if> <if test="customerNo != null and customerNo != ''"> and o.customer_no = #{customerNo}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if> <if test="createManId != null and createManId != ''"> and o.create_man_id = #{createManId}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if> <if test="status != null and status != ''"> and o.status = #{status}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="stockoutSource != null and stockoutSource != ''"> and o.stockout_source = #{stockoutSource}</if>
<if test="stockoutSource != null and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if> <if test="warehouseId != null and warehouseId != ''"> and o.warehouse_id = #{warehouseId}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="classNowId != null and classNowId != ''"> and o.class_now_id = #{classNowId}</if>
<if test="classNowId != null and classNowId != ''"> and class_now_id = #{classNowId}</if> <if test="exitId != null and exitId != ''"> and o.exit_id = #{exitId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if> <if test="carNumber != null and carNumber != ''"> and o.car_number = #{carNumber}</if>
<if test="carNumber != null and carNumber != ''"> and car_number = #{carNumber}</if> <if test="FID != null and FID != ''"> and o.FID = #{FID}</if>
<if test="FID != null and FID != ''"> and FID = #{FID}</if> <if test="erpStockoutId != null and erpStockoutId != ''"> and o.erp_stockout_id = #{erpStockoutId}</if>
<if test="erpStockoutId != null and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if> <if test="startDate != null and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
<if test="startDate != null and startDate != ''"> and start_date = #{startDate}</if> <if test="finishDate != null and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
<if test="finishDate != null and finishDate != ''"> and finish_date = #{finishDate}</if> <if test="productId != null and productId != ''"> and d.product_id = #{productId}</if>
<if test="productName != null and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
<if test="customerName != null and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
</where> </where>
</select> </select>
</mapper> </mapper>

43
ruoyi-admin/src/main/resources/mapper/out/OutStockoutMapper.xml
View File

@@ -22,6 +22,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="erpStockoutId" column="erp_stockout_id" /> <result property="erpStockoutId" column="erp_stockout_id" />
<result property="startDate" column="start_date" /> <result property="startDate" column="start_date" />
<result property="finishDate" column="finish_date" /> <result property="finishDate" column="finish_date" />
<result property="warehouseName" column="warehouse_name" />
<result property="customerName" column="customer_name" />
</resultMap> </resultMap>
<sql id="selectOutStockoutVo"> <sql id="selectOutStockoutVo">
@@ -29,23 +31,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql> </sql>
<select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult"> <select id="selectOutStockoutList" parameterType="OutStockout" resultMap="OutStockoutResult">
<include refid="selectOutStockoutVo"/> select distinct o.stockout_guid, o.stockout_id, o.out_type, o.create_date, o.department_no, o.customer_no, o.create_man_id, o.status, o.stockout_source,
o.warehouse_id, o.class_now_id, o.exit_id, o.car_number, o.FID, o.erp_stockout_id,o.start_date,o.finish_date,bw.warehouse_name,bc.customer_name from out_stockout o
left join bas_warehouse bw on bw.warehouse_id = o.warehouse_id
left join bas_customer bc on bc.customer_no = o.customer_no
left join out_stockout_detail d on d.stockout_id = o.stockout_id
left join bas_product bp on bp.product_id = d.product_id
<where> <where>
<if test="stockoutGuid != null and stockoutGuid != ''"> and stockout_guid = #{stockoutGuid}</if> <if test="stockoutGuid != null and stockoutGuid != ''"> and o.stockout_guid = #{stockoutGuid}</if>
<if test="stockoutId != null and stockoutId != ''"> and stockout_id = #{stockoutId}</if> <if test="stockoutId != null and stockoutId != ''"> and o.stockout_id = #{stockoutId}</if>
<if test="outType != null and outType != ''"> and out_type = #{outType}</if> <if test="outType != null and outType != ''"> and o.out_type = #{outType}</if>
<if test="createDate != null and createDate != ''"> and create_date = #{createDate}</if> <if test="startDate != null and startDate != ''"> and o.create_date &gt;= #{startDate}</if>
<if test="departmentNo != null and departmentNo != ''"> and department_no = #{departmentNo}</if> <if test="finishDate != null and finishDate != ''"> and o.create_date &lt;= #{finishDate}</if>
<if test="customerNo != null and customerNo != ''"> and customer_no = #{customerNo}</if> <if test="departmentNo != null and departmentNo != ''"> and o.department_no = #{departmentNo}</if>
<if test="createManId != null and createManId != ''"> and create_man_id = #{createManId}</if> <if test="customerNo != null and customerNo != ''"> and o.customer_no = #{customerNo}</if>
<if test="status != null and status != ''"> and status = #{status}</if> <if test="createManId != null and createManId != ''"> and o.create_man_id = #{createManId}</if>
<if test="stockoutSource != null and stockoutSource != ''"> and stockout_source = #{stockoutSource}</if> <if test="status != null and status != ''"> and o.status = #{status}</if>
<if test="warehouseId != null and warehouseId != ''"> and warehouse_id = #{warehouseId}</if> <if test="stockoutSource != null and stockoutSource != ''"> and o.stockout_source = #{stockoutSource}</if>
<if test="classNowId != null and classNowId != ''"> and class_now_id = #{classNowId}</if> <if test="warehouseId != null and warehouseId != ''"> and o.warehouse_id = #{warehouseId}</if>
<if test="exitId != null and exitId != ''"> and exit_id = #{exitId}</if> <if test="classNowId != null and classNowId != ''"> and o.class_now_id = #{classNowId}</if>
<if test="carNumber != null and carNumber != ''"> and car_number = #{carNumber}</if> <if test="exitId != null and exitId != ''"> and o.exit_id = #{exitId}</if>
<if test="FID != null and FID != ''"> and FID = #{FID}</if> <if test="carNumber != null and carNumber != ''"> and o.car_number = #{carNumber}</if>
<if test="erpStockoutId != null and erpStockoutId != ''"> and erp_stockout_id = #{erpStockoutId}</if> <if test="FID != null and FID != ''"> and o.FID = #{FID}</if>
<if test="erpStockoutId != null and erpStockoutId != ''"> and o.erp_stockout_id = #{erpStockoutId}</if>
<if test="productId != null and productId != ''"> and d.product_id = #{productId}</if>
<if test="productName != null and productName != ''"> and bp.product_name like concat('%', #{productName}, '%')</if>
<if test="customerName != null and customerName != ''"> and bc.customer_name like concat('%', #{customerName}, '%')</if>
</where> </where>
</select> </select>

27
ruoyi-admin/src/main/resources/mapper/pda/PdaMapper.xml Normal file
View File

@@ -0,0 +1,27 @@
<?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.ruoyi.pda.mapper.PdaMapper">
<select id="emptyTrayIn" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_tray_in(
#{v_tray_code,mode=IN,jdbcType=VARCHAR},
#{v_warehouse_id,mode=IN,jdbcType=VARCHAR},
#{v_quantity,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)}
</select>
<select id="emptyBoxIn" parameterType="java.util.Map" statementType="CALLABLE">
{call proc_box_in(
#{v_tray_code,mode=IN,jdbcType=VARCHAR},
#{v_entrance_id,mode=IN,jdbcType=VARCHAR},
#{v_result,mode=OUT,jdbcType=INTEGER},
#{v_resultmsg,mode=OUT,jdbcType=VARCHAR}
)}
</select>
</mapper>

523
ruoyi-ui/src/lang/en.js
View File

@@ -795,6 +795,527 @@ export default {
}, },
// ***************出库作业流水查询*************
searchViewOutJobFlow: {
title: '出库作业流水查询',
jobId: '作业ID',
inputJobId: '请输入作业ID',
jobDetailId: '子作业ID',
inputJobDetailId: '请输入子作业ID',
status: '状态',
selectStatus: '请选择状态',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
trayCode: '托盘码',
inputTrayCode: '请输入托盘码',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
priority: '优先级',
inputPriority: '请输入优先级',
executionPhase: '执行阶段',
selectExecutionPhase: '请选择执行阶段',
inOrOut: '作业类型',
inputInOrOut: '请输入作业类型',
exitId: '出口ID',
inputExitId: '请输入出口ID',
productId: '物料ID',
inputProductId: '请输入物料ID',
productName: '物料名称',
inputProductName: '请输入物料名称',
lotNo: '批号',
inputLotNo: '请输入批号',
stackingId: '剁型ID',
inputStackingId: '请输入剁型ID',
outQuantity: '出库数量',
giveNum: '回流数量',
inOrOutId: '单据ID',
inputInOrOutId: '请输入单据ID',
inOrOutDId: '子单据ID',
inputInOrOutDId: '请输入子单据ID',
createTime: '创建时间',
selectCreateTime: '请选择创建时间',
startTime: '开始时间',
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
customerName: '客户名称',
inputCustomerName: '请输入客户名称',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加出库做业务流水',
editTitle: '修改出库做业务流水',
deleteConfirm: '是否确认删除出库做业务流水编号为"',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
jobIdRequired: '作业ID不能为空'
},
// ***************入库作业流水查询*************
searchViewInJobFlow: {
status: '状态',
selectStatus: '请选择状态',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
trayCode: '托盘号',
inputTrayCode: '请输入托盘号',
productId: '物料ID',
inputProductId: '请输入物料ID',
lotNo: '批号',
inputLotNo: '请输入批号',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
productName: '物料名称',
inputProductName: '请输入物料名称',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
startTime: '开始时间',
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
search: '搜索',
reset: '重置',
jobId: '作业ID',
inputJobId: '请输入作业ID',
jobDetailId: '子作业ID',
inputJobDetailId: '请输入子作业ID',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
priority: '优先级',
inputPriority: '请输入优先级',
executionPhase: '执行阶段',
selectExecutionPhase: '请选择执行阶段',
inOrOut: '作业类型',
inputInOrOut: '请输入作业类型',
entranceId: '入口ID',
inputEntranceId: '请输入入口ID',
stackingId: '垛型ID',
inputStackingId: '请输入垛型ID',
inQuantity: '入库数量',
inputInQuantity: '请输入入库数量',
inOrOutId: '单据ID',
inputInOrOutId: '请输入单据ID',
inOrOutDId: '子单据ID',
inputInOrOutDId: '请输入子单据ID',
createTime: '创建时间',
selectCreateTime: '请选择创建时间',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
inputUnit: '请输入单位',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加入库作业流水',
editTitle: '修改入库作业流水',
deleteConfirm: '是否确认删除入库作业流水编号为"',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
export: '导出',
unit: '单位',
quantity: '库存数量'
},
// ***************库存明细查询*************
searchViewStockDetail: {
stockId: '库存ID',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
trayCode: '托盘号',
inputTrayCode: '请输入托盘号',
onlyIdentity: 'ID',
inputOnlyIdentity: '请输入ID',
stockinId: '入库单ID',
quantity: '数量',
inputQuantity: '请输入数量',
jobId: '作业ID',
inputJobId: '请输入作业ID',
lotNo: '批号',
inputLotNo: '请输入批号',
stockinDetailId: '入库子单ID',
inputStockinDetailId: '请输入入库子单ID',
inDate: '入库时间',
inputInDate: '请输入入库时间',
warehouseId: '仓库',
inputWarehouseId: '请输入仓库',
stackingId: '剁型ID',
inputStackingId: '请输入剁型ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceStatus: '货位状态',
inputCargoSpaceStatus: '请输入货位状态',
locked: '是否锁定',
inputLocked: '请输入是否锁定',
productId: '物料ID',
inputProductId: '请输入物料ID',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
unit: '单位',
inputUnit: '请输入单位',
price: '价格',
inputPrice: '请输入价格',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加库存明细查询',
editTitle: '修改库存明细查询',
deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项？',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功'
},
// ***************平库出库流水*************
searchViewFlatWarehouseOutFlow: {
warehouse: '仓库',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
createMan: '创建人',
inputCreateMan: '请输入创建人',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
search: '搜索',
reset: '重置',
export: '导出',
creator: '创建人',
materialId: '物料ID',
materialName: '物料名称',
quantity: '数量',
brand: '品牌',
unit: '单位',
price: '价格',
description: '描述',
warehouseId: '仓库ID',
warehouseName: '仓库名称',
address: '仓库地址',
warehouseDesc: '仓库描述',
warehouseLevel: '仓库级别',
warehouseType: '仓库类型',
available: '是否可用',
inputQuantity: '请输入入出库数量',
inputWarehouseId: '请输入仓库ID',
inputWarehouseName: '请输入仓库名称',
inputAddress: '请输入仓库地址',
inputBrand: '请输入品牌',
inputUnit: '请输入单位',
inputPrice: '请输入价格',
inputDescription: '请输入描述',
inputWarehouseDesc: '请输入仓库描述',
inputWarehouseLevel: '请输入仓库级别',
confirm: '确 定',
cancel: '取 消'
},
// ***************平库入库流水*************
searchViewFlatWarehouseInFlow: {
warehouse: '仓库',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
createMan: '创建人',
inputCreateMan: '请输入创建人',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
search: '搜索',
reset: '重置',
export: '导出',
creator: '创建人',
materialId: '物料ID',
materialName: '物料名称',
quantity: '数量',
brand: '品牌',
unit: '单位',
price: '价格',
description: '描述',
warehouseId: '仓库id',
warehouseName: '仓库名称',
address: '仓库地址',
warehouseDesc: '仓库描述',
warehouseLevel: '仓库级别',
warehouseType: '仓库类型',
available: '是否可用'
},
// ***************出库单据历史查询*************
searchViewStockoutHistory: {
stockoutId: '出库单号',
inputStockoutId: '请输入出库单号',
outType: '出库类型',
selectOutType: '请选择出库类型',
createDate: '创建日期',
selectCreateDate: '请选择创建日期',
createManId: '创建人ID',
inputCreateManId: '请输入创建人ID',
status: '出库状态',
selectStatus: '请选择出库状态',
stockoutSource: '出库来源',
inputStockoutSource: '请输入出库来源',
exitId: '出口类型',
inputExitId: '请输入出口类型',
stockoutDetailId: '出库明细ID',
inputStockoutDetailId: '请输入出库明细ID',
productId: '产品ID',
inputProductId: '请输入产品ID',
productName: '产品名称',
inputProductName: '请输入产品名称',
lotNo: '批次号',
inputLotNo: '请输入批次号',
quantity: '出库数量',
inputQuantity: '请输入出库数量',
allotQuantity: '分配数量',
inputAllotQuantity: '请输入分配数量',
assignNum: '分配编号',
inputAssignNum: '请输入分配编号',
erpStockoutId: 'ERP出库单ID',
inputErpStockoutId: '请输入ERP出库单ID',
entryid: '客户编号',
inputEntryid: '请输入客户编号',
customerName: '客户名称',
inputCustomerName: '请输入客户名称',
spec: '规格',
inputSpec: '请输入规格',
brand: '品牌',
inputBrand: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确定',
cancel: '取消'
},
// ***************入库单据历史查询*************
searchViewStockinHistory: {
stockinGuid: '入库单guid',
inputStockinGuid: '请输入入库单guid',
stockinId: '入库单号',
inputStockinId: '请输入入库单号',
inType: '入库类型',
selectInType: '请选择入库类型',
createDate: '创建时间',
selectCreateDate: '请选择创建时间',
finishDate: '完成时间',
selectFinishDate: '请选择完成时间',
createManId: '创建人',
inputCreateManId: '请输入创建人',
status: '单据状态',
selectStatus: '请选择单据状态',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
erpBill: 'ERP单号',
inputErpBill: '请输入ERP单号',
stockSource: '单据来源',
inputStockSource: '请输入单据来源',
departmentNo: '部门编码',
inputDepartmentNo: '请输入部门编码',
classNo: '班组编码',
inputClassNo: '请输入班组编码',
supplierNo: '供应商编号',
inputSupplierNo: '请输入供应商编号',
supplierName: '供应商名称',
inputSupplierName: '请输入供应商名称',
simpleName: '供应商简称',
inputSimpleName: '请输入供应商简称',
contactName: '联系人',
inputContactName: '请输入联系人',
contactNumber: '联系电话',
inputContactNumber: '请输入联系电话',
address: '供应商地址',
inputAddress: '请输入供应商地址',
stockinDetailId: '入库明细ID',
inputStockinDetailId: '请输入入库明细ID',
lotNo: '批次号',
inputLotNo: '请输入批次号',
printDate: '入库日期',
selectPrintDate: '请选择入库日期',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
price: '单价',
inputPrice: '请输入单价',
remark: '备注',
inputRemark: '请输入备注',
productId: '物料编码',
inputProductId: '请输入物料编码',
productName: '物料名称',
inputProductName: '请输入物料名称',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
spec: '规格',
inputSpec: '请输入规格',
quantity: '计划数量',
quantityX: '计划箱数',
quantityJ: '计划件数',
assignNum: '实际数量',
assignNumX: '实际箱数',
assignNumJ: '实际件数',
scanNum: '扫码数量',
scanNumX: '扫码箱数',
scanNumJ: '扫码件数',
search: '搜索',
reset: '重置',
export: '导出',
addTitle: '添加入库单据历史',
editTitle: '修改入库单据历史',
deleteConfirm: '是否确认删除入库单据历史编号为"{id}"的数据项？',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
confirm: '确 定',
cancel: '取 消'
},
// ***************收货单据管理*************
searchStockSummary: {
export: '导出',
productId: '物料编码',
inputProductId: '请输入物料编码',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
lotNo: '批号',
inputLotNo: '请输入批号',
warehouseId: '仓库',
inputWarehouseId: '请输入仓库',
roadwayId: '巷道',
inputRoadwayId: '请输入巷道',
search: '搜索',
reset: '重置',
unit: '单位',
quantity: '数量',
},
// ***************预警库存查询*************
searchViewStockWarning: {
stockId: '库存ID',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
productStatus: '物料状态',
selectProductStatus: '请选择物料状态',
lotNo: '批次号',
inputLotNo: '请输入批次号',
inDate: '入库时间',
inputInDate: '请输入入库时间',
backDate: '回流时间',
inputBackDate: '请输入回流时间',
quantity: '库存数量',
inputQuantity: '请输入库存数量',
jobId: '作业ID',
inputJobId: '请输入作业ID',
trayCode: '托盘条码',
inputTrayCode: '请输入托盘条码',
outQuantity: '出库数量',
inputOutQuantity: '请输入出库数量',
stockinId: '入库主单',
inputStockinId: '请输入入库主单',
inType: '入库类型',
selectInType: '请选择入库类型',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
stackingId: '垛型ID',
inputStackingId: '请输入垛型ID',
productId: '物料ID',
inputProductId: '请输入物料ID',
warehouseName: '仓库名称',
inputWarehouseName: '请输入仓库名称',
warehouseType: '仓库类型',
inputWarehouseType: '请输入仓库类型',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
price: '价格',
inputPrice: '请输入价格',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
cargoAreaId: '货区ID',
inputCargoAreaId: '请输入货区ID',
theType: '货位类型',
inputTheType: '请输入货位类型',
cargoStatus: '货位状态',
inputCargoStatus: '请输入货位状态',
locked: '是否锁定',
inputLocked: '请输入是否锁定',
cargoHight: '货位高度',
inputCargoHight: '请输入货位高度',
issDouble: '是否双伸',
inputIssDouble: '请输入是否双伸',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消'
},
//=====================系统管理:部门管理===================== //=====================系统管理:部门管理=====================
systemManagement_DeptManagement: { systemManagement_DeptManagement: {
@@ -812,7 +1333,7 @@ export default {
//--------------二级窗口标题-------------- //--------------二级窗口标题--------------
addDeptItem: 'Add Department', addDeptItem: 'Add Department',
editDeptItem: 'Edit Department', editDeptItem: 'Edit Department',
parentDept: 'Parent Department', parentDept: 'Parent Department',
setOrderNum: 'OrderNumber', setOrderNum: 'OrderNumber',
leader : 'Leader', leader : 'Leader',

523
ruoyi-ui/src/lang/zh.js
View File

@@ -875,12 +875,531 @@ export default {
}, },
//=====================系统管理:岗位管理===================== //=====================系统管理:岗位管理=====================
systemManagement_PostManagement: { systemManagement_PostManagement: {
}, },
// ***************出库作业流水查询*************
searchViewOutJobFlow: {
title: '出库作业流水查询',
jobId: '作业ID',
inputJobId: '请输入作业ID',
jobDetailId: '子作业ID',
inputJobDetailId: '请输入子作业ID',
status: '状态',
selectStatus: '请选择状态',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
trayCode: '托盘码',
inputTrayCode: '请输入托盘码',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
priority: '优先级',
inputPriority: '请输入优先级',
executionPhase: '执行阶段',
selectExecutionPhase: '请选择执行阶段',
inOrOut: '作业类型',
inputInOrOut: '请输入作业类型',
exitId: '出口ID',
inputExitId: '请输入出口ID',
productId: '物料ID',
inputProductId: '请输入物料ID',
productName: '物料名称',
inputProductName: '请输入物料名称',
lotNo: '批号',
inputLotNo: '请输入批号',
stackingId: '剁型ID',
inputStackingId: '请输入剁型ID',
outQuantity: '出库数量',
giveNum: '回流数量',
inOrOutId: '单据ID',
inputInOrOutId: '请输入单据ID',
inOrOutDId: '子单据ID',
inputInOrOutDId: '请输入子单据ID',
createTime: '创建时间',
selectCreateTime: '请选择创建时间',
startTime: '开始时间',
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
customerName: '客户名称',
inputCustomerName: '请输入客户名称',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加出库做业务流水',
editTitle: '修改出库做业务流水',
deleteConfirm: '是否确认删除出库做业务流水编号为"',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
jobIdRequired: '作业ID不能为空'
},
// ***************入库作业流水查询*************
searchViewInJobFlow: {
status: '状态',
selectStatus: '请选择状态',
taskNo: '任务号',
inputTaskNo: '请输入任务号',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
trayCode: '托盘号',
inputTrayCode: '请输入托盘号',
productId: '物料ID',
inputProductId: '请输入物料ID',
lotNo: '批号',
inputLotNo: '请输入批号',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
productName: '物料名称',
inputProductName: '请输入物料名称',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
startTime: '开始时间',
selectStartTime: '请选择开始时间',
finishTime: '结束时间',
selectFinishTime: '请选择结束时间',
search: '搜索',
reset: '重置',
jobId: '作业ID',
inputJobId: '请输入作业ID',
jobDetailId: '子作业ID',
inputJobDetailId: '请输入子作业ID',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
priority: '优先级',
inputPriority: '请输入优先级',
executionPhase: '执行阶段',
selectExecutionPhase: '请选择执行阶段',
inOrOut: '作业类型',
inputInOrOut: '请输入作业类型',
entranceId: '入口ID',
inputEntranceId: '请输入入口ID',
stackingId: '垛型ID',
inputStackingId: '请输入垛型ID',
inQuantity: '入库数量',
inputInQuantity: '请输入入库数量',
inOrOutId: '单据ID',
inputInOrOutId: '请输入单据ID',
inOrOutDId: '子单据ID',
inputInOrOutDId: '请输入子单据ID',
createTime: '创建时间',
selectCreateTime: '请选择创建时间',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
inputUnit: '请输入单位',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加入库作业流水',
editTitle: '修改入库作业流水',
deleteConfirm: '是否确认删除入库作业流水编号为"',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
export: '导出',
unit: '单位',
quantity: '库存数量'
},
// ***************库存明细查询*************
searchViewStockDetail: {
stockId: '库存ID',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
trayCode: '托盘号',
inputTrayCode: '请输入托盘号',
onlyIdentity: 'ID',
inputOnlyIdentity: '请输入ID',
stockinId: '入库单ID',
quantity: '数量',
inputQuantity: '请输入数量',
jobId: '作业ID',
inputJobId: '请输入作业ID',
lotNo: '批号',
inputLotNo: '请输入批号',
stockinDetailId: '入库子单ID',
inputStockinDetailId: '请输入入库子单ID',
inDate: '入库时间',
inputInDate: '请输入入库时间',
warehouseId: '仓库',
inputWarehouseId: '请输入仓库',
stackingId: '剁型ID',
inputStackingId: '请输入剁型ID',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
roadwayId: '巷道ID',
inputRoadwayId: '请输入巷道ID',
cargoSpaceStatus: '货位状态',
inputCargoSpaceStatus: '请输入货位状态',
locked: '是否锁定',
inputLocked: '请输入是否锁定',
productId: '物料ID',
inputProductId: '请输入物料ID',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
unit: '单位',
inputUnit: '请输入单位',
price: '价格',
inputPrice: '请输入价格',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消',
add: '新增',
edit: '修改',
delete: '删除',
addTitle: '添加库存明细查询',
editTitle: '修改库存明细查询',
deleteConfirm: '是否确认删除库存明细查询编号为"{id}"的数据项？',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功'
},
// ***************平库出库流水*************
searchViewFlatWarehouseOutFlow: {
warehouse: '仓库',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
createMan: '创建人',
inputCreateMan: '请输入创建人',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
search: '搜索',
reset: '重置',
export: '导出',
creator: '创建人',
materialId: '物料ID',
materialName: '物料名称',
quantity: '数量',
brand: '品牌',
unit: '单位',
price: '价格',
description: '描述',
warehouseId: '仓库ID',
warehouseName: '仓库名称',
address: '仓库地址',
warehouseDesc: '仓库描述',
warehouseLevel: '仓库级别',
warehouseType: '仓库类型',
available: '是否可用',
inputQuantity: '请输入入出库数量',
inputWarehouseId: '请输入仓库ID',
inputWarehouseName: '请输入仓库名称',
inputAddress: '请输入仓库地址',
inputBrand: '请输入品牌',
inputUnit: '请输入单位',
inputPrice: '请输入价格',
inputDescription: '请输入描述',
inputWarehouseDesc: '请输入仓库描述',
inputWarehouseLevel: '请输入仓库级别',
confirm: '确 定',
cancel: '取 消'
},
// ***************平库入库流水*************
searchViewFlatWarehouseInFlow: {
warehouse: '仓库',
selectWarehouse: '请选择仓库',
productId: '物料ID',
inputProductId: '请输入物料ID',
createMan: '创建人',
inputCreateMan: '请输入创建人',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
search: '搜索',
reset: '重置',
export: '导出',
creator: '创建人',
materialId: '物料ID',
materialName: '物料名称',
quantity: '数量',
brand: '品牌',
unit: '单位',
price: '价格',
description: '描述',
warehouseId: '仓库id',
warehouseName: '仓库名称',
address: '仓库地址',
warehouseDesc: '仓库描述',
warehouseLevel: '仓库级别',
warehouseType: '仓库类型',
available: '是否可用'
},
// ***************出库单据历史查询*************
searchViewStockoutHistory: {
stockoutId: '出库单号',
inputStockoutId: '请输入出库单号',
outType: '出库类型',
selectOutType: '请选择出库类型',
createDate: '创建日期',
selectCreateDate: '请选择创建日期',
createManId: '创建人ID',
inputCreateManId: '请输入创建人ID',
status: '出库状态',
selectStatus: '请选择出库状态',
stockoutSource: '出库来源',
inputStockoutSource: '请输入出库来源',
exitId: '出口类型',
inputExitId: '请输入出口类型',
stockoutDetailId: '出库明细ID',
inputStockoutDetailId: '请输入出库明细ID',
productId: '产品ID',
inputProductId: '请输入产品ID',
productName: '产品名称',
inputProductName: '请输入产品名称',
lotNo: '批次号',
inputLotNo: '请输入批次号',
quantity: '出库数量',
inputQuantity: '请输入出库数量',
allotQuantity: '分配数量',
inputAllotQuantity: '请输入分配数量',
assignNum: '分配编号',
inputAssignNum: '请输入分配编号',
erpStockoutId: 'ERP出库单ID',
inputErpStockoutId: '请输入ERP出库单ID',
entryid: '客户编号',
inputEntryid: '请输入客户编号',
customerName: '客户名称',
inputCustomerName: '请输入客户名称',
spec: '规格',
inputSpec: '请输入规格',
brand: '品牌',
inputBrand: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确定',
cancel: '取消'
},
// ***************入库单据历史查询*************
searchViewStockinHistory: {
stockinGuid: '入库单guid',
inputStockinGuid: '请输入入库单guid',
stockinId: '入库单号',
inputStockinId: '请输入入库单号',
inType: '入库类型',
selectInType: '请选择入库类型',
createDate: '创建时间',
selectCreateDate: '请选择创建时间',
finishDate: '完成时间',
selectFinishDate: '请选择完成时间',
createManId: '创建人',
inputCreateManId: '请输入创建人',
status: '单据状态',
selectStatus: '请选择单据状态',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
erpBill: 'ERP单号',
inputErpBill: '请输入ERP单号',
stockSource: '单据来源',
inputStockSource: '请输入单据来源',
departmentNo: '部门编码',
inputDepartmentNo: '请输入部门编码',
classNo: '班组编码',
inputClassNo: '请输入班组编码',
supplierNo: '供应商编号',
inputSupplierNo: '请输入供应商编号',
supplierName: '供应商名称',
inputSupplierName: '请输入供应商名称',
simpleName: '供应商简称',
inputSimpleName: '请输入供应商简称',
contactName: '联系人',
inputContactName: '请输入联系人',
contactNumber: '联系电话',
inputContactNumber: '请输入联系电话',
address: '供应商地址',
inputAddress: '请输入供应商地址',
stockinDetailId: '入库明细ID',
inputStockinDetailId: '请输入入库明细ID',
lotNo: '批次号',
inputLotNo: '请输入批次号',
printDate: '入库日期',
selectPrintDate: '请选择入库日期',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
price: '单价',
inputPrice: '请输入单价',
remark: '备注',
inputRemark: '请输入备注',
productId: '物料编码',
inputProductId: '请输入物料编码',
productName: '物料名称',
inputProductName: '请输入物料名称',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
spec: '规格',
inputSpec: '请输入规格',
quantity: '计划数量',
quantityX: '计划箱数',
quantityJ: '计划件数',
assignNum: '实际数量',
assignNumX: '实际箱数',
assignNumJ: '实际件数',
scanNum: '扫码数量',
scanNumX: '扫码箱数',
scanNumJ: '扫码件数',
search: '搜索',
reset: '重置',
export: '导出',
addTitle: '添加入库单据历史',
editTitle: '修改入库单据历史',
deleteConfirm: '是否确认删除入库单据历史编号为"{id}"的数据项？',
deleteSuccess: '删除成功',
addSuccess: '新增成功',
editSuccess: '修改成功',
confirm: '确 定',
cancel: '取 消'
},
// ***************收货单据管理*************
searchStockSummary: {
export: '导出',
productId: '物料编码',
inputProductId: '请输入物料编码',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
lotNo: '批号',
inputLotNo: '请输入批号',
warehouseId: '仓库',
inputWarehouseId: '请输入仓库',
roadwayId: '巷道',
inputRoadwayId: '请输入巷道',
search: '搜索',
reset: '重置',
unit: '单位',
quantity: '数量',
},
// ***************预警库存查询*************
searchViewStockWarning: {
stockId: '库存ID',
inputStockId: '请输入库存ID',
cargoSpaceId: '货位ID',
inputCargoSpaceId: '请输入货位ID',
stockStatus: '库存状态',
selectStockStatus: '请选择库存状态',
productStatus: '物料状态',
selectProductStatus: '请选择物料状态',
lotNo: '批次号',
inputLotNo: '请输入批次号',
inDate: '入库时间',
inputInDate: '请输入入库时间',
backDate: '回流时间',
inputBackDate: '请输入回流时间',
quantity: '库存数量',
inputQuantity: '请输入库存数量',
jobId: '作业ID',
inputJobId: '请输入作业ID',
trayCode: '托盘条码',
inputTrayCode: '请输入托盘条码',
outQuantity: '出库数量',
inputOutQuantity: '请输入出库数量',
stockinId: '入库主单',
inputStockinId: '请输入入库主单',
inType: '入库类型',
selectInType: '请选择入库类型',
warehouseId: '仓库ID',
inputWarehouseId: '请输入仓库ID',
stackingId: '垛型ID',
inputStackingId: '请输入垛型ID',
productId: '物料ID',
inputProductId: '请输入物料ID',
warehouseName: '仓库名称',
inputWarehouseName: '请输入仓库名称',
warehouseType: '仓库类型',
inputWarehouseType: '请输入仓库类型',
isCurrent: '是否可用',
inputIsCurrent: '请输入是否可用',
productName: '物料名称',
inputProductName: '请输入物料名称',
spec: '规格',
inputSpec: '请输入规格',
cargoNo: '品牌',
inputCargoNo: '请输入品牌',
unit: '单位',
inputUnit: '请输入单位',
price: '价格',
inputPrice: '请输入价格',
cargoSpaceName: '货位名称',
inputCargoSpaceName: '请输入货位名称',
cargoAreaId: '货区ID',
inputCargoAreaId: '请输入货区ID',
theType: '货位类型',
inputTheType: '请输入货位类型',
cargoStatus: '货位状态',
inputCargoStatus: '请输入货位状态',
locked: '是否锁定',
inputLocked: '请输入是否锁定',
cargoHight: '货位高度',
inputCargoHight: '请输入货位高度',
issDouble: '是否双伸',
inputIssDouble: '请输入是否双伸',
thePlatoon: '排',
inputThePlatoon: '请输入排',
theColumn: '列',
inputTheColumn: '请输入列',
theFloor: '层',
inputTheFloor: '请输入层',
search: '搜索',
reset: '重置',
export: '导出',
confirm: '确 定',
cancel: '取 消'
},
} }

64
ruoyi-ui/src/views/out/outStockoutManage.vue
View File

@@ -30,14 +30,46 @@
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item :label="$t('outStockoutManage.customerNo')" prop="customerNo"> <!-- 客户编码 --> <!-- <el-form-item label="客户编码" prop="customerNo">-->
<!-- <el-input-->
<!-- v-model="queryParams.customerNo"-->
<!-- placeholder="请输入客户编码"-->
<!-- clearable-->
<!-- @keyup.enter.native="handleQuery"-->
<!-- />-->
<!-- </el-form-item>-->
<el-form-item label="客户名称" prop="customerName">
<el-input <el-input
v-model="queryParams.customerNo" v-model="queryParams.customerName"
:placeholder="$t('outStockoutManage.inputCustomerNo')" placeholder="请输入客户名称"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="物资名称" prop="productName">
<el-input
v-model="queryParams.customerNo"
placeholder="请输入客户编码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建开始时间" prop="startDate">
<el-date-picker clearable
v-model="queryParams.startDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="创建结束时间" prop="finishDate">
<el-date-picker clearable
v-model="queryParams.finishDate"
type="datetime"
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="请选择创建结束时间">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outStockoutManage.search')}}</el-button> <!-- 搜索 --> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">{{$t('outStockoutManage.search')}}</el-button> <!-- 搜索 -->
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outStockoutManage.reset')}}</el-button> <!-- 重置 --> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">{{$t('outStockoutManage.reset')}}</el-button> <!-- 重置 -->
@@ -110,12 +142,14 @@
<dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/> <dict-tag :options="dict.type.out_bill_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" /> <!-- 客户编码 --> <el-table-column label="$t('outStockoutManage.customerNo')" align="center" prop="customerNo" />
<el-table-column :label="$t('outStockoutManage.createManId')" align="center" prop="createManId" /> <!-- 建单人 --> <el-table-column label="客户名称" align="center" prop="customerName" />
<el-table-column :label="$t('outStockoutManage.createDate')" align="center" prop="createDate" /> <!-- 创建时间 --> <el-table-column label="$t('outStockoutManage.createManId')" align="center" prop="createManId" />
<el-table-column :label="$t('outStockoutManage.startDate')" align="center" prop="startDate" /> <!-- 开始时间 --> <el-table-column label="$t('outStockoutManage.createDate')" align="center" prop="createDate" />
<el-table-column :label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" /> <!-- 确认时间 --> <el-table-column label="$t('outStockoutManage.startDate')" align="center" prop="startDate" />
<el-table-column :label="$t('outStockoutManage.warehouseId')" align="center" prop="warehouseId" /> <!-- 仓库编号 --> <el-table-column label="$t('outStockoutManage.finishDate')" align="center" prop="finishDate" />
<!-- <el-table-column label="仓库编号" align="center" prop="warehouseId" />-->
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
</el-table> </el-table>
<pagination <pagination
@@ -130,13 +164,15 @@
<el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;"> <el-table v-loading="detailLoading" :data="outStockDetailList.slice((detailQueryParams.pageNum-1)*detailQueryParams.pageSize, detailQueryParams.pageNum*detailQueryParams.pageSize)" style="margin-top: 20px;">
<el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 --> <el-table-column :label="$t('outStockoutManage.stockoutDetailId')" align="center" prop="stockoutDetailId" /> <!-- 出库子单编号 -->
<el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 --> <el-table-column :label="$t('outStockoutManage.productId')" align="center" prop="productId" /> <!-- 物资编码 -->
<el-table-column label="物资名称" align="center" prop="productName" />
<el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 --> <el-table-column :label="$t('outStockoutManage.lotNo')" align="center" prop="lotNo" /> <!-- 批次 -->
<el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 --> <el-table-column :label="$t('outStockoutManage.quantity')" align="center" prop="quantity" /> <!-- 计划数量 -->
<el-table-column :label="$t('outStockoutManage.assignNum')" align="center" prop="assignNum" /> <!-- 实际数量 --> <el-table-column :label="$t('outStockoutManage.assignNum')" align="center" prop="assignNum" /> <!-- 实际数量 -->
<el-table-column :label="$t('outStockoutManage.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 --> <el-table-column :label="$t('outStockoutManage.allotQuantity')" align="center" prop="allotQuantity" /> <!-- 分配数量 -->
<el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> <!-- 单位 --> <!-- <el-table-column :label="$t('outStockoutManage.unit')" align="center" prop="unit" /> &lt;!&ndash; 单位 &ndash;&gt;-->
<el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> <!-- 规格 --> <!-- <el-table-column :label="$t('outStockoutManage.spec')" align="center" prop="spec" /> &lt;!&ndash; 规格 &ndash;&gt;-->
<el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> <!-- 价格 --> <!-- <el-table-column :label="$t('outStockoutManage.price')" align="center" prop="price" /> &lt;!&ndash; 价格 &ndash;&gt;-->
<el-table-column :label="$t('outStockoutManage.remark')" align="center" prop="remark" /> <!-- 备注 --> <el-table-column :label="$t('outStockoutManage.remark')" align="center" prop="remark" /> <!-- 备注 -->
</el-table> </el-table>
@@ -179,6 +215,10 @@ export default {
stockoutId: null, stockoutId: null,
outType: null, outType: null,
customerNo: null, customerNo: null,
customerName: null,
productName: null,
startDate: null,
finishDate: null,
status: '1' status: '1'
}, },
// 子表分页参数 // 子表分页参数