WMS:完善Web原材料出库审核和查询功能;完成Web原材料退库审核和查询功能
master
xins 10 months ago
parent 687c644217
commit c644b07717

@ -182,7 +182,7 @@ public class WmsMobileController extends BaseController {
}
/**
*
* 退
*/
@Log(title = "原材料退库记录", businessType = BusinessType.AUDIT)
@PostMapping(("/auditRawReturn"))

@ -52,14 +52,19 @@ public class WmsRawOutstockController extends BaseController
public TableDataInfo list(WmsRawOutstock wmsRawOutstock)
{
startPage();
List<WmsRawOutstock> list = wmsRawOutstockService.selectWmsRawOutstockJoinList4Audit(wmsRawOutstock);
List<WmsRawOutstock> list = wmsRawOutstockService.selectWmsRawOutstockJoinList(wmsRawOutstock);
return getDataTable(list);
}
@GetMapping(value = "/getRawOutstockByTaskCode/{taskCode}")
public AjaxResult getRawOutstockByTaskCode(@PathVariable("taskCode") String taskCode) {
return success(wmsRawOutstockService.selectWmsRawOutstockByTaskCode(taskCode));
/**
* 使
*/
@RequiresPermissions("wms:rawoutstock:list")
@GetMapping(value = "/getWarehouses")
public AjaxResult getWarehouses() {
WmsBaseWarehouse queryWarehouse = new WmsBaseWarehouse();
List<WmsBaseWarehouse> warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse);
return success(warehouses);
}
/**
@ -85,38 +90,6 @@ public class WmsRawOutstockController extends BaseController
return success(wmsRawOutstockService.selectWmsRawOutstockByRawOutstockId(rawOutstockId));
}
/**
*
*/
@RequiresPermissions("wms:rawoutstock:add")
@Log(title = "原材料出库记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WmsRawOutstock wmsRawOutstock)
{
return toAjax(wmsRawOutstockService.insertWmsRawOutstock(wmsRawOutstock));
}
/**
*
*/
@RequiresPermissions("wms:rawoutstock:edit")
@Log(title = "原材料出库记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WmsRawOutstock wmsRawOutstock)
{
return toAjax(wmsRawOutstockService.updateWmsRawOutstock(wmsRawOutstock));
}
/**
*
*/
@RequiresPermissions("wms:rawoutstock:remove")
@Log(title = "原材料出库记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{rawOutstockIds}")
public AjaxResult remove(@PathVariable Long[] rawOutstockIds)
{
return toAjax(wmsRawOutstockService.deleteWmsRawOutstockByRawOutstockIds(rawOutstockIds));
}
/**
@ -140,15 +113,21 @@ public class WmsRawOutstockController extends BaseController
public TableDataInfo auditList(WmsRawOutstock wmsRawOutstock)
{
startPage();
wmsRawOutstock.setAuditStatus(WmsConstants.WMS_AUDIT_STATUS_TOAUDIT);
List<WmsRawOutstock> list = wmsRawOutstockService.selectWmsRawOutstockList(wmsRawOutstock);
List<WmsRawOutstock> list = wmsRawOutstockService.selectWmsRawOutstockJoinList4Audit(wmsRawOutstock);
return getDataTable(list);
}
@RequiresPermissions("wms:rawoutstock:audit:query")
@GetMapping(value = "/getRawOutstockByTaskCode/{taskCode}")
public AjaxResult getRawOutstockByTaskCode(@PathVariable("taskCode") String taskCode) {
return success(wmsRawOutstockService.selectWmsRawOutstockByTaskCode(taskCode));
}
/**
*
*/
@RequiresPermissions("wms:rawoutstock:audit:audit")
@Log(title = "原材料出库记录", businessType = BusinessType.AUDIT)
@PostMapping(("/auditRawOutstock"))
public AjaxResult auditRawOutstock(@Validated @RequestBody WmsRawOutstockAuditVo wmsRawOutstockAuditVo) {
@ -157,11 +136,11 @@ public class WmsRawOutstockController extends BaseController
/**
* 使
* 使
*/
// @RequiresPermissions("wms:rawoutstock:query")
@GetMapping(value = "/getWarehouses")
public AjaxResult getWarehouses() {
@RequiresPermissions("wms:rawoutstock:audit:list")
@GetMapping(value = "/getWarehouses4Audit")
public AjaxResult getWarehouses4Audit() {
WmsBaseWarehouse queryWarehouse = new WmsBaseWarehouse();
List<WmsBaseWarehouse> warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse);
return success(warehouses);

@ -3,7 +3,13 @@ package com.hw.wms.controller;
import java.util.List;
import java.io.IOException;
import javax.servlet.http.HttpServletResponse;
import com.hw.wms.domain.WmsBaseWarehouse;
import com.hw.wms.domain.vo.WmsRawOutstockAuditVo;
import com.hw.wms.domain.vo.WmsRawReturnAuditVo;
import com.hw.wms.service.IWmsBaseWarehouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@ -24,7 +30,7 @@ import com.hw.common.core.web.page.TableDataInfo;
/**
* 退Controller
*
*
* @author xs
* @date 2023-12-20
*/
@ -35,6 +41,9 @@ public class WmsRawReturnController extends BaseController
@Autowired
private IWmsRawReturnService wmsRawReturnService;
@Autowired
private IWmsBaseWarehouseService wmsBaseWarehouseService;
/**
* 退
*/
@ -43,7 +52,7 @@ public class WmsRawReturnController extends BaseController
public TableDataInfo list(WmsRawReturn wmsRawReturn)
{
startPage();
List<WmsRawReturn> list = wmsRawReturnService.selectWmsRawReturnList(wmsRawReturn);
List<WmsRawReturn> list = wmsRawReturnService.selectWmsRawReturnJoinList(wmsRawReturn);
return getDataTable(list);
}
@ -70,36 +79,60 @@ public class WmsRawReturnController extends BaseController
return success(wmsRawReturnService.selectWmsRawReturnByRawReturnId(rawReturnId));
}
/**
* 退
* 使
*/
@RequiresPermissions("wms:rawreturn:add")
@Log(title = "原材料退库记录", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody WmsRawReturn wmsRawReturn)
{
return toAjax(wmsRawReturnService.insertWmsRawReturn(wmsRawReturn));
@RequiresPermissions("wms:rawreturn:list")
@GetMapping(value = "/getWarehouses")
public AjaxResult getWarehouses() {
WmsBaseWarehouse queryWarehouse = new WmsBaseWarehouse();
List<WmsBaseWarehouse> warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse);
return success(warehouses);
}
/**
* 退
* 退
*/
@RequiresPermissions("wms:rawreturn:edit")
@Log(title = "原材料退库记录", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody WmsRawReturn wmsRawReturn)
@RequiresPermissions("wms:rawreturn:audit:list")
@GetMapping("/auditList")
public TableDataInfo auditList(WmsRawReturn wmsRawReturn)
{
return toAjax(wmsRawReturnService.updateWmsRawReturn(wmsRawReturn));
startPage();
List<WmsRawReturn> list = wmsRawReturnService.selectWmsRawReturnJoinList(wmsRawReturn);
return getDataTable(list);
}
/**
* 退
* 退
*/
@RequiresPermissions("wms:rawreturn:remove")
@Log(title = "原材料退库记录", businessType = BusinessType.DELETE)
@DeleteMapping("/{rawReturnIds}")
public AjaxResult remove(@PathVariable Long[] rawReturnIds)
@RequiresPermissions("wms:rawreturn:audit:query")
@GetMapping(value = "/getRawreturn4Audit/{rawReturnId}")
public AjaxResult getRawreturn4Audit(@PathVariable("rawReturnId") Long rawReturnId)
{
return toAjax(wmsRawReturnService.deleteWmsRawReturnByRawReturnIds(rawReturnIds));
return success(wmsRawReturnService.selectWmsRawReturnByRawReturnId(rawReturnId));
}
/**
* 退
*/
@RequiresPermissions("wms:rawreturn:audit:audit")
@Log(title = "原材料退库记录", businessType = BusinessType.AUDIT)
@PostMapping(("/auditRawReturn"))
public AjaxResult auditRawReturn(@Validated @RequestBody WmsRawReturnAuditVo wmsRawReturnAuditVo) {
return toAjax(wmsRawReturnService.auditWmsRawReturn(wmsRawReturnAuditVo));
}
/**
* 使
*/
@RequiresPermissions("wms:rawreturn:audit:list")
@GetMapping(value = "/getWarehouses4Audit")
public AjaxResult getWarehouses4Audit() {
WmsBaseWarehouse queryWarehouse = new WmsBaseWarehouse();
List<WmsBaseWarehouse> warehouses = wmsBaseWarehouseService.selectWmsBaseWarehouseList(queryWarehouse);
return success(warehouses);
}
}

@ -130,4 +130,13 @@ public interface WmsRawOutstockMapper
*/
public int auditWmsRawOutstockByTaskCode(WmsRawOutstock wmsRawOutstock);
/**
* ,Join material
*
* @param rawOutstockId
* @return
*/
public WmsRawOutstock selectWmsRawOutstockJoinMaterialById(Long rawOutstockId);
}

@ -67,26 +67,31 @@ public class WmsRawOutstockServiceImpl implements IWmsRawOutstockService {
*/
@Override
public WmsRawOutstock selectWmsRawOutstockByRawOutstockId(Long rawOutstockId) {
WmsRawOutstock wmsRawOutstock = wmsRawOutstockMapper.selectWmsRawOutstockByRawOutstockId(rawOutstockId);
List<WmsRawOutstockDetail> wmsRawOutstockDetailList = wmsRawOutstock.getWmsRawOutstockDetailList();
Long[] materialIds = wmsRawOutstockDetailList.stream().map(o -> o.getMaterialId()).toArray(Long[]::new);
MesBaseMaterialInfoVo mesBaseMaterialInfoVo = new MesBaseMaterialInfoVo();
mesBaseMaterialInfoVo.setMaterialIds(materialIds);
R<List<MesBaseMaterialInfo>> materialInfosR = remoteMesService.getMaterialsByMaterialIds(mesBaseMaterialInfoVo, SecurityConstants.INNER);
if (materialInfosR != null) {
List<MesBaseMaterialInfo> materialInfos = materialInfosR.getData();
Map<Long, MesBaseMaterialInfo> MesBaseMaterialInfoMap = materialInfos.stream()
.collect(Collectors.toMap(MesBaseMaterialInfo::getMaterialId, mesBaseMaterialInfo -> mesBaseMaterialInfo));
wmsRawOutstockDetailList.forEach(wmsRawOutstockDetail -> {
MesBaseMaterialInfo materialInfo = MesBaseMaterialInfoMap.get(wmsRawOutstockDetail.getMaterialId());
if (materialInfo != null) {
wmsRawOutstockDetail.setMaterialCode(materialInfo.getMaterialCode());
wmsRawOutstockDetail.setMaterialName(materialInfo.getMaterialName());
}
});
}
WmsRawOutstock wmsRawOutstock = wmsRawOutstockMapper.selectWmsRawOutstockJoinMaterialById(rawOutstockId);
WmsRawOutstockDetail queryRawOutstockDetail = new WmsRawOutstockDetail();
queryRawOutstockDetail.setRawOutstockId(wmsRawOutstock.getRawOutstockId());
List<WmsRawOutstockDetail> wmsRawOutstockDetailList = wmsRawOutstockDetailMapper.selectWmsRawOutstockDetailList(queryRawOutstockDetail);
wmsRawOutstock.setWmsRawOutstockDetailList(wmsRawOutstockDetailList);
// if(wmsRawOutstockDetailList!=null && !wmsRawOutstockDetailList.isEmpty()){
// Long[] materialIds = wmsRawOutstockDetailList.stream().map(o -> o.getMaterialId()).toArray(Long[]::new);
// MesBaseMaterialInfoVo mesBaseMaterialInfoVo = new MesBaseMaterialInfoVo();
// mesBaseMaterialInfoVo.setMaterialIds(materialIds);
// R<List<MesBaseMaterialInfo>> materialInfosR = remoteMesService.getMaterialsByMaterialIds(mesBaseMaterialInfoVo, SecurityConstants.INNER);
// if (materialInfosR != null) {
// List<MesBaseMaterialInfo> materialInfos = materialInfosR.getData();
//
// Map<Long, MesBaseMaterialInfo> MesBaseMaterialInfoMap = materialInfos.stream()
// .collect(Collectors.toMap(MesBaseMaterialInfo::getMaterialId, mesBaseMaterialInfo -> mesBaseMaterialInfo));
//
// wmsRawOutstockDetailList.forEach(wmsRawOutstockDetail -> {
// MesBaseMaterialInfo materialInfo = MesBaseMaterialInfoMap.get(wmsRawOutstockDetail.getMaterialId());
// if (materialInfo != null) {
// wmsRawOutstockDetail.setMaterialCode(materialInfo.getMaterialCode());
// wmsRawOutstockDetail.setMaterialName(materialInfo.getMaterialName());
// }
// });
// }
// }
return wmsRawOutstock;
}

@ -224,7 +224,7 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
/**
* 退,退使
* 退,退使join warehouse
*
* @param wmsRawReturn 退
* @return 退
@ -277,7 +277,7 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
// }
if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) {
throw new ServiceException("输入数量大于0");
throw new ServiceException("输入数量大于0");
}
R<MesBaseBarcodeInfo> mesBaseBarcodeInfoR = remoteMesService.getBarcode(materialBarcode, SecurityConstants.INNER);
@ -290,7 +290,7 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
}
WmsRawReturn wmsRawReturn = wmsRawReturnMapper.selectOnlyWmsRawReturnByRawReturnId(rawReturnId);
if (!wmsRawReturn.getAuditStatus().equals(WmsConstants.WMS_AUDIT_STATUS_PASS)) {
throw new ServiceException("审核未通过,不能库");
throw new ServiceException("审核未通过,不能退库");
}
if (wmsRawReturn.getExecuteStatus().equals(WmsConstants.WMS_EXECUTE_STATUS_FINISH)) {
@ -299,13 +299,13 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
String batchFlag = mesBaseBarcodeInfo.getBatchFlag();
if (!batchFlag.equals(MesConstants.IS_BATCH)) {
if (returnAmount.compareTo(BigDecimal.ONE) != 0) {
throw new ServiceException("输入数量需为1");
}
}
// if (!batchFlag.equals(MesConstants.IS_BATCH)) {
// if (returnAmount.compareTo(BigDecimal.ONE) != 0) {
// throw new ServiceException("输入数量需为1");
// }
// }
if (!wmsRawReturn.getMaterialId().equals(mesBaseBarcodeInfo.getMaterialId())) {
if (!wmsRawReturn.getMaterialBarcode().equals(materialBarcode)) {
throw new ServiceException("物料编码错误");
}
@ -318,13 +318,10 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
throw new ServiceException("退库仓库有误");
}
// 判断本次退库数量+已退库数量是否大于计划退库数量
// 判断本次退库数量是否等于计划退库数量
BigDecimal planAmount = wmsRawReturn.getPlanAmount();
BigDecimal hadReturnAmount = wmsRawReturn.getReturnAmount() == null ? BigDecimal.ZERO : wmsRawReturn.getReturnAmount();
BigDecimal updatedReturnAmount = hadReturnAmount.add(returnAmount);
if (updatedReturnAmount.compareTo(planAmount) > 0) {
throw new ServiceException("退库数量不能大于" + planAmount);
if (returnAmount.compareTo(planAmount) != 0) {
throw new ServiceException("退库数量需等于" + planAmount);
}
WmsRawReturnDetail queryRawReturnDetail = new WmsRawReturnDetail();
@ -335,25 +332,19 @@ public class WmsRawReturnServiceImpl implements IWmsRawReturnService {
throw new ServiceException("已经退库,无需重复退库");
}
String executeStatus = "";
if (updatedReturnAmount.compareTo(planAmount) == 0) {
executeStatus = WmsConstants.WMS_EXECUTE_STATUS_FINISH;
} else {
executeStatus = WmsConstants.WMS_EXECUTE_STATUS_EXECUTING;
}
Date currentDate = new Date();
String userName = SecurityUtils.getUsername();
//更新退库记录执行状态
wmsRawReturn.setExecuteStatus(executeStatus);
wmsRawReturn.setReturnAmount(updatedReturnAmount);
wmsRawReturn.setExecuteStatus( WmsConstants.WMS_EXECUTE_STATUS_FINISH);
wmsRawReturn.setLocationCode(locationCode);
wmsRawReturn.setReturnAmount(returnAmount);
wmsRawReturn.setUpdateDate(currentDate);
wmsRawReturn.setUpdateBy(userName);
wmsRawReturnMapper.updateWmsRawReturn(wmsRawReturn);
//插入退库记录明细
this.insertRawReturnDetails(wmsRawReturnConfirmVo, wmsRawReturn,
mesBaseBarcodeInfo, userName, currentDate);
// this.insertRawReturnDetails(wmsRawReturnConfirmVo, wmsRawReturn,
// mesBaseBarcodeInfo, userName, currentDate);
//更新原材料库存
this.updateRawStock(wmsRawReturnConfirmVo, mesBaseBarcodeInfo, baseLocation, userName, currentDate);

@ -27,6 +27,23 @@ spring:
# 共享配置
shared-configs:
- application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
## Tomcat
#server:
# port: 7304
#
## Spring
#spring:
# application:
# # 应用名称
# name: hw-wms
# profiles:
# # 环境配置
# active: prod
# cloud:
# nacos:
# discovery:
# # 服务注册地址

@ -104,12 +104,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectWmsRawOutstockByRawOutstockId" parameterType="Long" resultMap="WmsRawOutstockWmsRawOutstockDetailResult">
select a.raw_outstock_id, a.task_code, a.warehouse_id, a.location_code, a.order_id, a.plan_code, a.plan_detail_code, a.station_id, a.product_id, a.material_batch, a.pallet_info_code, a.outstock_amount, a.real_outstock_amount, a.end_station_code, a.operation_type, a.task_type, a.apply_reason, a.audit_reason, a.audit_status, a.execute_status, a.apply_by, a.apply_date, a.audit_by, a.audit_date, a.update_by, a.update_date, a.begin_time, a.end_time, a.erp_status, a.erp_amount,
b.raw_outstock_detail_id as sub_raw_outstock_detail_id, b.raw_outstock_id as sub_raw_outstock_id, b.task_code as sub_task_code, b.warehouse_id as sub_warehouse_id, b.location_code as sub_location_code, b.material_barcode as sub_material_barcode, b.material_id as sub_material_id, b.instock_batch as sub_instock_batch, b.material_production_date as sub_material_production_date, b.plan_amount as sub_plan_amount, b.outstock_amount as sub_outstock_amount, b.execute_status as sub_execute_status, b.erp_status as sub_erp_status, b.erp_amount as sub_erp_amount, b.outstock_person as sub_outstock_person, b.outstock_time as sub_outstock_time, b.outstock_way as sub_outstock_way, b.machine_name as sub_machine_name, b.quality_status as sub_quality_status, b.create_by as sub_create_by, b.create_date as sub_create_date, b.update_by as sub_update_by, b.update_date as sub_update_date, b.stack_amount as sub_stack_amount
from wms_raw_outstock a
left join wms_raw_outstock_detail b on b.raw_outstock_id = a.raw_outstock_id
where a.raw_outstock_id = #{rawOutstockId}
<select id="selectWmsRawOutstockByRawOutstockId" parameterType="Long" resultMap="WmsRawOutstockResult">
<include refid="selectWmsRawOutstockVo"/>
where raw_outstock_id = #{rawOutstockId}
</select>
<insert id="insertWmsRawOutstock" parameterType="WmsRawOutstock" useGeneratedKeys="true" keyProperty="rawOutstockId">
@ -246,17 +243,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWmsRawOutstockJoinList" parameterType="WmsRawOutstock" resultMap="WmsRawOutstockResult">
select wro.raw_outstock_id, wro.task_code, wro.warehouse_id, wro.location_code, wro.order_id, wro.plan_code, wro.plan_detail_code, wro.station_id,
select wro.raw_outstock_id, wro.task_code, wro.warehouse_id, wro.location_code, wro.order_id, wro.plan_code, wro.plan_detail_code, wro.station_id,wro.material_batch,
wro.product_id, wro.operation_type, wro.task_type, wro.apply_reason, wro.audit_reason, wro.audit_status, wro.execute_status, wro.apply_by, wro.apply_date,
wro.audit_by, wro.audit_date, wro.update_by, wro.update_date, wro.begin_time, wro.end_time,wbw.warehouse_name
from wms_raw_outstock wro left join wms_base_warehouse wbw on wro.warehouse_id = wbw.warehouse_id
<where>
<if test="taskCode != null and taskCode != ''"> and wro.task_code like concat('%', #{taskCode}, '%')</if>
<if test="warehouseId != null "> and wro.warehouse_id = #{warehouseId}</if>
<if test="planCode != null "> and wro.plan_code like concat('%', #{planCode}, '%')</if>
<if test="planDetailCode != null "> and wro.plan_detail_code like concat('%', #{planDetailCode}, '%')</if>
<if test="applyReason != null and applyReason != ''"> and wro.apply_reason like concat('%', #{applyReason}, '%')</if>
<if test="auditStatus != null and auditStatus != ''"> and wro.audit_status = #{auditStatus}</if>
<if test="taskType != null and taskType != ''"> and wro.task_type = #{taskType}</if>
<if test="applyBy != null and applyBy != ''"> and wro.apply_by like concat('%', #{applyBy}, '%')</if>
</where>
</select>
<select id="selectWmsRawOutstockJoinList4Audit" parameterType="WmsRawOutstock" resultMap="WmsRawOutstockResult">
select wro.task_code, wro.warehouse_id, wro.apply_reason, wro.apply_by, wro.apply_date,wro.plan_code,wro.plan_detail_code,wro.audit_status,
select wro.task_code, wro.warehouse_id, wro.apply_reason, wro.apply_by, wro.apply_date,wro.plan_code,wro.plan_detail_code,wro.audit_status,wro.task_type,
wbw.warehouse_name
from wms_raw_outstock wro left join wms_base_warehouse wbw on wro.warehouse_id = wbw.warehouse_id
<where>
@ -266,15 +270,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="planDetailCode != null "> and wro.plan_detail_code like concat('%', #{planDetailCode}, '%')</if>
<if test="applyReason != null and applyReason != ''"> and wro.apply_reason like concat('%', #{applyReason}, '%')</if>
<if test="auditStatus != null and auditStatus != ''"> and wro.audit_status = #{auditStatus}</if>
<if test="taskType != null and taskType != ''"> and wro.task_type = #{taskType}</if>
<if test="applyBy != null and applyBy != ''"> and wro.apply_by like concat('%', #{applyBy}, '%')</if>
</where>
group by wro.task_code,wro.warehouse_id, wro.apply_reason, wro.apply_by, wro.apply_date,wro.plan_code,wro.plan_detail_code,wro.audit_status
group by wro.task_code,wro.warehouse_id, wro.apply_reason, wro.apply_by, wro.apply_date,wro.plan_code,wro.plan_detail_code,wro.audit_status,wro.task_type
</select>
<!--as转换是为了兼容PDA转换-->
<select id="selectWmsRawOutstockJoinMaterialList" parameterType="WmsRawOutstock" resultMap="WmsRawOutstockResult">
select wro.raw_outstock_id as raw_outstock_detail_id, wro.task_code,wro.location_code,wro.material_batch as instock_batch,wro.outstock_amount as plan_amount,wro.real_outstock_amount as outstock_amount,
wro.apply_by,wro.apply_date,wro.apply_reason,wro.audit_by,wro.audit_date,wro.audit_reason,wro.plan_code,wro.plan_detail_code,wro.audit_status,
wro.apply_by,wro.apply_date,wro.apply_reason,wro.audit_by,wro.audit_date,wro.audit_reason,wro.plan_code,wro.plan_detail_code,wro.audit_status,wro.task_type,
wro.execute_status,wro.erp_status,wro.erp_amount,
mbmi.material_code,mbmi.material_name
from wms_raw_outstock wro left join mes_base_material_info mbmi on wro.product_id = mbmi.material_id
@ -306,4 +311,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<select id="selectWmsRawOutstockJoinMaterialById" parameterType="WmsRawOutstock" resultMap="WmsRawOutstockResult">
select wro.raw_outstock_id as raw_outstock_detail_id, wro.task_code,wro.location_code,wro.material_batch,wro.outstock_amount,wro.real_outstock_amount,
wro.apply_by,wro.apply_date,wro.apply_reason,wro.audit_by,wro.audit_date,wro.audit_reason,wro.plan_code,wro.plan_detail_code,wro.audit_status,wro.task_type,
wro.execute_status,wro.erp_status,wro.erp_amount,
mbmi.material_code,mbmi.material_name
from wms_raw_outstock wro left join mes_base_material_info mbmi on wro.product_id = mbmi.material_id
where wro.raw_outstock_id = #{rawOutstockId}
</select>
</mapper>

@ -238,13 +238,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectWmsRawReturnJoinList" parameterType="WmsRawReturn" resultMap="WmsRawReturnResult">
select wrr.raw_return_id, wrr.task_code, wrr.warehouse_id, wrr.location_code, wrr.plan_code, wrr.plan_detail_code,
wrr.material_id,wrr.plan_amount,wrr.return_amount,wrr.product_id,
wrr.material_id,wrr.plan_amount,wrr.return_amount,wrr.product_id,wrr.material_barcode,
wrr.operation_type, wrr.task_type, wrr.apply_reason, wrr.audit_reason, wrr.audit_status,
wrr.execute_status, wrr.apply_by, wrr.apply_date, wrr.audit_by, wrr.audit_date,wrr.begin_time, wrr.end_time,
wbw.warehouse_name
from wms_raw_return wrr left join wms_base_warehouse wbw on wrr.warehouse_id = wbw.warehouse_id
<where>
<if test="taskCode != null and taskCode != ''"> and wrr.task_code like concat('%', #{taskCode}, '%')</if>
<if test="warehouseId != null "> and wrr.warehouse_id = #{warehouseId}</if>
<if test="planCode != null and planCode != ''"> and wrr.plan_code like concat('%', #{planCode}, '%')</if>
<if test="planDetailCode != null and planDetailCode != ''"> and wrr.plan_detail_code like concat('%', #{planDetailCode}, '%')</if>
<if test="materialBarcode != null and materialBarcode != ''"> and wrr.material_barcode like concat('%', #{materialBarcode}, '%')</if>
<if test="operationType != null and operationType != ''"> and wrr.operation_type = #{operationType}</if>
<if test="taskType != null and taskType != ''"> and wrr.task_type = #{taskType}</if>
<if test="applyReason != null and applyReason != ''"> and wrr.apply_reason like concat('%', #{applyReason}, '%')</if>
<if test="auditReason != null and auditReason != ''"> and wrr.audit_reason like concat('%', #{auditReason}, '%')</if>
<if test="auditStatus != null and auditStatus != ''"> and wrr.audit_status = #{auditStatus}</if>
<if test="executeStatus != null and executeStatus != ''"> and wrr.execute_status = #{executeStatus}</if>
<if test="applyBy != null and applyBy != ''"> and wrr.apply_by like concat('%', #{applyBy}, '%')</if>
<if test="auditStatus != null and auditStatus != ''"> and wrr.audit_status = #{auditStatus}</if>
</where>
</select>
@ -252,7 +264,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectOnlyWmsRawReturnByRawReturnId" parameterType="Long" resultMap="WmsRawReturnResult">
select wrr.raw_return_id, wrr.task_code, wrr.warehouse_id, wrr.location_code, wrr.plan_code, wrr.plan_detail_code,
wrr.material_id,wrr.plan_amount,wrr.return_amount,wrr.product_id,
wrr.material_id,wrr.plan_amount,wrr.return_amount,wrr.product_id,wrr.material_barcode,wrr.batch_code,
wrr.operation_type, wrr.task_type, wrr.apply_reason, wrr.audit_reason, wrr.audit_status,
wrr.execute_status, wrr.apply_by, wrr.apply_date, wrr.audit_by, wrr.audit_date,wrr.begin_time, wrr.end_time,
wbw.warehouse_name

@ -46,6 +46,16 @@ export function delRawoutstock(rawOutstockId) {
// 查询原材料出库记录列表,提供审核使用
export function auditListRawoutstock(query) {
return request({
url: '/wms/rawoutstock/auditList',
method: 'get',
params: query
})
}
// 查询原材料出库记录详细
export function getRawOutstockByTaskCode(taskCode) {
return request({
@ -64,10 +74,19 @@ export function auditRawOutstock(data) {
}
// 查询原材料出库记录详细
// 查询仓库列表
export function getWarehouses() {
return request({
url: '/wms/rawoutstock/getWarehouses',
method: 'get'
})
}
// 查询仓库列表
export function getWarehouses4Audit() {
return request({
url: '/wms/rawoutstock/getWarehouses4Audit',
method: 'get'
})
}

@ -0,0 +1,96 @@
import request from '@/utils/request'
// 查询原材料退库记录列表
export function listRawreturn(query) {
return request({
url: '/wms/rawreturn/list',
method: 'get',
params: query
})
}
// 查询原材料退库记录详细
export function getRawreturn(rawReturnId) {
return request({
url: '/wms/rawreturn/' + rawReturnId,
method: 'get'
})
}
// 新增原材料退库记录
export function addRawreturn(data) {
return request({
url: '/wms/rawreturn',
method: 'post',
data: data
})
}
// 修改原材料退库记录
export function updateRawreturn(data) {
return request({
url: '/wms/rawreturn',
method: 'put',
data: data
})
}
// 删除原材料退库记录
export function delRawreturn(rawReturnId) {
return request({
url: '/wms/rawreturn/' + rawReturnId,
method: 'delete'
})
}
// 查询原材料退库记录列表,提供给审核使用
export function auditListRawreturn(query) {
return request({
url: '/wms/rawreturn/auditList',
method: 'get',
params: query
})
}
// 查询原材料退库记录详细
export function getRawreturn4Audit(rawReturnId) {
return request({
url: '/wms/rawreturn/getRawreturn4Audit/' + rawReturnId,
method: 'get'
})
}
// 审核原材料退库记录
export function auditRawReturn(data) {
return request({
url: '/wms/rawreturn/auditRawReturn',
method: 'post',
data: data
})
}
// 查询仓库列表,提供审核使用
export function getWarehouses4Audit() {
return request({
url: '/wms/rawreturn/getWarehouses4Audit',
method: 'get'
})
}
// 查询仓库列表,提供记录查询使用
export function getWarehouses() {
return request({
url: '/wms/rawreturn/getWarehouses',
method: 'get'
})
}

@ -35,6 +35,21 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="出库类型" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择出库类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.wms_raw_outstock_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="申请人" prop="applyBy">
<el-input
@ -47,7 +62,7 @@
<el-form-item label="审核状态" prop="auditStatus">
<el-select
v-model="queryParams.auditStatus"
placeholder="审核状态"
placeholder="请选择审核状态"
clearable
style="width: 240px"
>
@ -72,12 +87,16 @@
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="计划编号" align="center" prop="planCode" />
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" />
<el-table-column label="物料批次" align="center" prop="materialBatch" />
<el-table-column label="库位编码" align="center" prop="locationCode" />
<el-table-column label="出库类型" align="center" prop="auditStatus" >
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyBy" />
<el-table-column label="申请原因" align="center" prop="applyReason" />
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核状态" align="center" prop="auditStatus" >
<template slot-scope="scope">
@ -121,7 +140,7 @@ import { listRawoutstock,getWarehouses } from "@/api/wms/rawoutstock";
export default {
name: "Rawoutstock",
dicts: ['wms_audit_status', 'wms_execute_status'],
dicts: ['wms_audit_status', 'wms_execute_status','wms_raw_outstock_task_type'],
data() {
return {
//
@ -179,33 +198,6 @@ export default {
},
//
form: {},
//
rules: {
taskCode: [
{ required: true, message: "任务编号不能为空", trigger: "blur" }
],
warehouseId: [
{ required: true, message: "仓库ID;领料时需要保存不能为空", trigger: "blur" }
],
outstockAmount: [
{ required: true, message: "计划出库数量不能为空", trigger: "blur" }
],
realOutstockAmount: [
{ required: true, message: "已出库数量不能为空", trigger: "blur" }
],
operationType: [
{ required: true, message: "操作类型(0自动,1人工,2强制,3调度)不能为空", trigger: "change" }
],
taskType: [
{ required: true, message: "任务类型(1生产领料,2拆分出库,3组装出库,9其他)不能为空", trigger: "change" }
],
auditStatus: [
{ required: true, message: "审核状态(0待审核,1审核通过,2审核未通过)不能为空", trigger: "change" }
],
executeStatus: [
{ required: true, message: "执行状态(0待执行,1执行中,2执行完成)不能为空", trigger: "change" }
],
},
//
warehouseOptions: [],
@ -308,16 +300,17 @@ export default {
const taskCode = row.taskCode
const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/detail/' + taskCode+'/0/'+warehouseName, params);
this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode+'/0/'+warehouseName, params);
},
/** 审核按钮操作 */
handleDetail(row) {
this.reset();
const taskCode = row.taskCode;
const rawOutstockId = row.rawOutstockId;
const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("出库明细[" + taskCode + "]", '/wms/raw-outstock/detail/' + taskCode+'/1/'+warehouseName, params);
this.$tab.openPage("出库明细[" + taskCode + "]", '/wms/raw-outstock/detail/' + rawOutstockId+'/1/'+warehouseName, params);
},
/** 导出按钮操作 */

@ -1,6 +1,6 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="任务编号" prop="taskCode">
@ -25,6 +25,31 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="物料批次" prop="materialBatch">
<el-input v-model="form.materialBatch" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划出库数量" prop="outstockAmount">
<el-input v-model="form.outstockAmount" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="已出库数量" prop="realOutstockAmount">
<el-input v-model="form.realOutstockAmount" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="申请人" prop="applyBy">
@ -69,13 +94,27 @@
</el-row>
<el-row v-if="detailFlag">
<el-col :span="16" :offset="2">
<el-col :span="6" :offset="2">
<el-form-item label="出库类型" prop="taskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="form.taskType"/>
</template>
</el-form-item>
</el-col>
<el-col :span="6" :offset="2">
<el-form-item label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="form.auditStatus"/>
</template>
</el-form-item>
</el-col>
<el-col :span="6" :offset="2">
<el-form-item label="执行状态" prop="executeStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="form.executeStatus"/>
</template>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">原材料出库记录明细信息</el-divider>
@ -83,39 +122,25 @@
ref="wmsRawOutstockDetail">
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="库位编码" prop="locationCode"/>
<el-table-column label="物料名称" prop="materialName"/>
<el-table-column label="物料批次" prop="instockBatch"/>
<el-table-column label="物料条码" prop="materialBarcode"/>
<el-table-column label="计划数量" prop="planAmount"/>
<el-table-column label="出库数量" prop="outstockAmount" v-if="detailFlag"/>
<el-table-column label="执行状态" prop="executeStatus" v-if="detailFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/>
</template>
</el-table-column>
<el-table-column label="同步ERP状态" prop="erpStatus" v-if="detailFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_erp_status" :value="scope.row.erpStatus"/>
</template>
</el-table-column>
<el-table-column label="同步ERP数量" prop="erpAmount" v-if="detailFlag"/>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="auditPass" v-if="!detailFlag"></el-button>
<el-button type="primary" @click="auditFail" v-if="!detailFlag"></el-button>
<el-button @click="cancel"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</div>
</template>
<script>
import {
getRawOutstockByTaskCode,
getRawoutstock,
auditRawOutstock,
} from "@/api/wms/rawoutstock";
export default {
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_erp_status'],
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_erp_status','wms_raw_outstock_task_type'],
name: "Rawoutstock",
data() {
return {
@ -148,20 +173,22 @@ export default {
};
},
created() {
const rawOutstockId = this.$route.params && this.$route.params.rawOutstockId;
const taskCode = this.$route.params && this.$route.params.taskCode;
const detailFlag = this.$route.params && this.$route.params.detailFlag;
const warehouseName = this.$route.params && this.$route.params.warehouseName;
this.detailFlag = detailFlag == "1";
this.form.rawOutstockId = rawOutstockId;
this.form.taskCode = taskCode;
this.warehouseName = warehouseName;
this.getRawOutstockByTaskCode();
this.getRawOutstock();
},
methods: {
/** 根据任务编号获取出库明细 */
getRawOutstockByTaskCode() {
getRawOutstockByTaskCode(this.form.taskCode).then(response => {
this.form = response.data.wmsRawOutstock;
getRawOutstock() {
getRawoutstock(this.form.rawOutstockId).then(response => {
this.form = response.data;
this.form.warehouseName = this.warehouseName;
this.wmsRawOutstockDetailList = response.data.wmsRawOutstockDetailList;
this.open = true;

@ -0,0 +1,257 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="计划编号" prop="planCode">
<el-input
v-model="queryParams.planCode"
placeholder="请输入计划编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="明细编号" prop="planDetailCode">
<el-input
v-model="queryParams.planDetailCode"
placeholder="请输入计划明细编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料条码" prop="materialBarcode">
<el-input
v-model="queryParams.materialBarcode"
placeholder="请输入物料条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="退库类型" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择退库类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.wms_raw_return_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="申请人" prop="applyBy">
<el-input
v-model="queryParams.applyBy"
placeholder="请输入申请人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="rawreturnList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center"/>
<el-table-column label="任务编号" align="center" prop="taskCode"/>
<el-table-column label="仓库" align="center" prop="warehouseName"/>
<el-table-column label="计划编号" align="center" prop="planCode"/>
<el-table-column label="计划明细编号" align="center" prop="planDetailCode"/>
<el-table-column label="物料条码" align="center" prop="materialBarcode"/>
<el-table-column label="计划退库数量" align="center" prop="planAmount"/>
<el-table-column label="退库类型" align="center" prop="taskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_return_task_type" :value="scope.row.taskType"/>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyBy"/>
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="申请原因" align="center" prop="applyReason"/>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-info"
@click="handleDetail(scope.row)"
v-hasPermi="['wms:rawreturn:audit:query']"
>查看
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import {listRawreturn, getWarehouses,} from "@/api/wms/rawreturn";
export default {
name: "Rawreturn",
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_return_task_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
checkedWmsRawReturnDetail: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 退
rawreturnList: [],
// 退
wmsRawReturnDetailList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
taskCode: null,
warehouseId: null,
locationCode: null,
planCode: null,
planDetailCode: null,
productId: null,
materialId: null,
materialBarcode: null,
batchCode: null,
planAmount: null,
returnAmount: null,
operationType: null,
taskType: null,
endStationCode: null,
applyReason: null,
auditReason: null,
auditStatus: null,
executeStatus: null,
applyBy: null,
applyDate: null,
auditBy: null,
auditDate: null,
updateDate: null,
beginTime: null,
endTime: null,
erpStatus: null,
erpAmount: null
},
//
form: {},
//
//
warehouseOptions: [],
};
},
created() {
this.getList();
this.getWarehouseList();
},
activated() {
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
this.queryParams.pageNum = Number(this.$route.query.pageNum);
this.getList();
}
},
methods: {
/** 查询原材料退库记录列表 */
getList() {
this.loading = true;
listRawreturn(this.queryParams).then(response => {
this.rawreturnList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询仓库列表 */
getWarehouseList() {
getWarehouses().then(response => {
this.warehouseOptions = response.data;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.rawReturnId)
this.single = selection.length !== 1
this.multiple = !selection.length
},
/** 审核按钮操作 */
handleDetail(row) {
const rawReturnId = row.rawReturnId
const taskCode = row.taskCode
const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("退库详情[" + taskCode + "]", '/wms/raw-return/detail/' + rawReturnId + '/1/' + warehouseName, params);
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/rawreturn/export', {
...this.queryParams
}, `rawreturn_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,280 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="任务编号" prop="taskCode">
<el-input v-model="form.taskCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="仓库" prop="warehouseName">
<el-input v-model="form.warehouseName" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="明细编号" prop="planDetailCode">
<el-input v-model="form.planDetailCode" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="成品名称" prop="productName">
<el-input v-model="form.productName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="物料条码" prop="materialBarcode">
<el-input v-model="form.materialBarcode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="form.batchCode" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划退库数量" prop="planAmount">
<el-input v-model="form.planAmount" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2" v-if="detailFlag">
<el-form-item label="已退库数量" prop="returnAmount">
<el-input v-model="form.returnAmount" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="申请人" prop="applyBy">
<el-input v-model="form.applyBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="申请时间" prop="applyDate">
<el-input v-model="form.applyDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="申请原因" prop="applyReason">
<el-input v-model="form.applyReason" type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="8" :offset="2">
<el-form-item label="审核人" prop="auditBy">
<el-input v-model="form.auditBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="审核时间" prop="auditDate">
<el-input v-model="form.auditDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="审核原因" prop="auditReason">
<el-input v-model="form.auditReason" type="textarea" :disabled="detailFlag"/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="16" :offset="2">
<el-form-item label="同步ERP数量" prop="erpAmount">
<el-input v-model="form.erpAmount" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="6" :offset="2">
<el-form-item label="退库类型" prop="taskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_return_task_type" :value="form.taskType"/>
</template>
</el-form-item>
</el-col>
<el-col :span="6" :offset="2">
<el-form-item label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="form.auditStatus"/>
</template>
</el-form-item>
</el-col>
<el-col :span="6" :offset="2">
<el-form-item label="执行状态" prop="executeStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="form.executeStatus"/>
</template>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="auditPass" v-if="!detailFlag"></el-button>
<el-button type="primary" @click="auditFail" v-if="!detailFlag"></el-button>
<el-button @click="cancel"> </el-button>
</div>
</div>
</template>
<script>
import {auditRawReturn, getRawreturn} from "@/api/wms/rawreturn";
export default {
name: "Rawreturn",
dicts: ["wms_audit_status","wms_erp_status","wms_execute_status","wms_raw_return_task_type"],
data() {
return {
//
loading: true,
//
ids: [],
//
checkedWmsRawReturnDetail: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 退
rawreturnList: [],
// 退
wmsRawReturnDetailList: [],
//
title: "",
//
open: false,
//
form: {},
//
detailFlag: true,
rawReturnId: null,
};
},
created() {
const rawReturnId = this.$route.params && this.$route.params.rawReturnId;
const taskCode = this.$route.params && this.$route.params.taskCode;
const detailFlag = this.$route.params && this.$route.params.detailFlag;
const warehouseName = this.$route.params && this.$route.params.warehouseName;
this.detailFlag = detailFlag == "1";
this.form.taskCode = taskCode;
this.warehouseName = warehouseName;
this.rawReturnId = rawReturnId;
this.getRawReturn();
},
methods: {
/** 查询原材料退库记录列表 */
getRawReturn() {
this.loading = true;
getRawreturn(this.rawReturnId).then(response => {
this.form = response.data;
this.form.warehouseName = this.warehouseName;
this.loading = false;
});
},
//
cancel() {
const obj = {path: "/wms/info/rawreturn", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
this.$tab.closeOpenPage(obj);
},
//
reset() {
this.form = {
rawReturnId: null,
taskCode: null,
warehouseId: null,
locationCode: null,
planCode: null,
planDetailCode: null,
productId: null,
materialId: null,
materialBarcode: null,
batchCode: null,
planAmount: null,
returnAmount: null,
operationType: null,
taskType: null,
endStationCode: null,
applyReason: null,
auditReason: null,
auditStatus: null,
executeStatus: null,
applyBy: null,
applyDate: null,
auditBy: null,
auditDate: null,
updateBy: null,
updateDate: null,
beginTime: null,
endTime: null,
erpStatus: null,
erpAmount: null
};
this.wmsRawReturnDetailList = [];
this.resetForm("form");
},
auditPass() {
this.form.auditStatus = "1";
this.submitForm();
},
auditFail() {
this.form.auditStatus = "2";
if (!this.form.auditReason || this.form.auditReason == "" || this.form.auditReason == undefined) {
this.$modal.msgWarning("请输入审核原因!");
return;
}
this.submitForm();
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
auditRawReturn(this.form).then(response => {
this.$modal.msgSuccess("保存成功");
this.cancel();
});
}
});
},
}
};
</script>

@ -0,0 +1,395 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="仓库ID" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库楼层" prop="warehouseFloor">
<el-input
v-model="queryParams.warehouseFloor"
placeholder="请输入仓库楼层"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料ID" prop="materialId">
<el-input
v-model="queryParams.materialId"
placeholder="请输入物料ID"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="总数量;仓库存放的总数量" prop="totalAmount">
<el-input
v-model="queryParams.totalAmount"
placeholder="请输入总数量;仓库存放的总数量"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="冻结数量;手动冻结的,暂时可不用" prop="frozenAmount">
<el-input
v-model="queryParams.frozenAmount"
placeholder="请输入冻结数量;手动冻结的,暂时可不用"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新;" prop="occupyAmount">
<el-input
v-model="queryParams.occupyAmount"
placeholder="请输入占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新;"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-date-picker clearable
v-model="queryParams.createDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后更新时间" prop="updateDate">
<el-date-picker clearable
v-model="queryParams.updateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效标记" prop="activeFlag">
<el-input
v-model="queryParams.activeFlag"
placeholder="请输入有效标记"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['wms:stocktotal:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['wms:stocktotal:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['wms:stocktotal:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wms:stocktotal:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="stocktotalList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="总库存ID" align="center" prop="stockTotalId" />
<el-table-column label="仓库ID" align="center" prop="warehouseId" />
<el-table-column label="仓库楼层" align="center" prop="warehouseFloor" />
<el-table-column label="库存类型1原材料2半成品3成品" align="center" prop="stockType" />
<el-table-column label="物料ID" align="center" prop="materialId" />
<el-table-column label="总数量;仓库存放的总数量" align="center" prop="totalAmount" />
<el-table-column label="冻结数量;手动冻结的,暂时可不用" align="center" prop="frozenAmount" />
<el-table-column label="占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新;" align="center" prop="occupyAmount" />
<el-table-column label="创建时间" align="center" prop="createDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.createDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="最后更新时间" align="center" prop="updateDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="有效标记" align="center" prop="activeFlag" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:stocktotal:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:stocktotal:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 添加或修改原材料库存对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="仓库ID" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID" />
</el-form-item>
<el-form-item label="仓库楼层" prop="warehouseFloor">
<el-input v-model="form.warehouseFloor" placeholder="请输入仓库楼层" />
</el-form-item>
<el-form-item label="物料ID" prop="materialId">
<el-input v-model="form.materialId" placeholder="请输入物料ID" />
</el-form-item>
<el-form-item label="总数量;仓库存放的总数量" prop="totalAmount">
<el-input v-model="form.totalAmount" placeholder="请输入总数量;仓库存放的总数量" />
</el-form-item>
<el-form-item label="冻结数量;手动冻结的,暂时可不用" prop="frozenAmount">
<el-input v-model="form.frozenAmount" placeholder="请输入冻结数量;手动冻结的,暂时可不用" />
</el-form-item>
<el-form-item label="占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新;" prop="occupyAmount">
<el-input v-model="form.occupyAmount" placeholder="请输入占用数量;申请时占用的数量,在出库时要减去出库数量,并且总数量要同步更新;" />
</el-form-item>
<el-form-item label="创建时间" prop="createDate">
<el-date-picker clearable
v-model="form.createDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择创建时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后更新时间" prop="updateDate">
<el-date-picker clearable
v-model="form.updateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="有效标记" prop="activeFlag">
<el-input v-model="form.activeFlag" placeholder="请输入有效标记" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listStocktotal, getStocktotal, delStocktotal, addStocktotal, updateStocktotal } from "@/api/wms/stocktotal";
export default {
name: "Stocktotal",
data() {
return {
//
loading: true,
//
ids: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
stocktotalList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
warehouseId: null,
warehouseFloor: null,
stockType: null,
materialId: null,
totalAmount: null,
frozenAmount: null,
occupyAmount: null,
createDate: null,
updateDate: null,
activeFlag: null
},
//
form: {},
//
rules: {
warehouseId: [
{ required: true, message: "仓库ID不能为空", trigger: "blur" }
],
warehouseFloor: [
{ required: true, message: "仓库楼层不能为空", trigger: "blur" }
],
stockType: [
{ required: true, message: "库存类型1原材料2半成品3成品不能为空", trigger: "change" }
],
materialId: [
{ required: true, message: "物料ID不能为空", trigger: "blur" }
],
totalAmount: [
{ required: true, message: "总数量;仓库存放的总数量不能为空", trigger: "blur" }
],
}
};
},
created() {
this.getList();
},
methods: {
/** 查询原材料库存列表 */
getList() {
this.loading = true;
listStocktotal(this.queryParams).then(response => {
this.stocktotalList = response.rows;
this.total = response.total;
this.loading = false;
});
},
//
cancel() {
this.open = false;
this.reset();
},
//
reset() {
this.form = {
stockTotalId: null,
warehouseId: null,
warehouseFloor: null,
stockType: null,
materialId: null,
totalAmount: null,
frozenAmount: null,
occupyAmount: null,
createBy: null,
createDate: null,
updateBy: null,
updateDate: null,
activeFlag: null
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.stockTotalId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加原材料库存";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const stockTotalId = row.stockTotalId || this.ids
getStocktotal(stockTotalId).then(response => {
this.form = response.data;
this.open = true;
this.title = "修改原材料库存";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
if (this.form.stockTotalId != null) {
updateStocktotal(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addStocktotal(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const stockTotalIds = row.stockTotalId || this.ids;
this.$modal.confirm('是否确认删除原材料库存编号为"' + stockTotalIds + '"的数据项?').then(function() {
return delStocktotal(stockTotalIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/stocktotal/export', {
...this.queryParams
}, `stocktotal_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -1,69 +1,55 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务编号;移库时必须" prop="taskCode">
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入任务编号;移库时必须"
placeholder="请输入任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库ID;领料时需要保存" prop="warehouseId">
<el-input
v-model="queryParams.warehouseId"
placeholder="请输入仓库ID;领料时需要保存"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="库位编码;移库和合库时需要保存" prop="locationCode">
<el-input
v-model="queryParams.locationCode"
placeholder="请输入库位编码;移库和合库时需要保存"
clearable
@keyup.enter.native="handleQuery"
/>
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="工单ID,关联pd_base_order_info的order_id" prop="orderId">
<el-form-item label="计划编号" prop="planCode">
<el-input
v-model="queryParams.orderId"
placeholder="请输入工单ID,关联pd_base_order_info的order_id"
v-model="queryParams.planCode"
placeholder="请输入计划编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划ID,关联pd_base_plan_info的plan_id" prop="planId">
<el-form-item label="明细编号" prop="planDetailCode">
<el-input
v-model="queryParams.planId"
placeholder="请输入计划ID,关联pd_base_plan_info的plan_id"
v-model="queryParams.planDetailCode"
placeholder="请输入计划明细编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="计划明细ID,关联pd_base_plan_detail的plan_detail_id" prop="planDetailId">
<el-input
v-model="queryParams.planDetailId"
placeholder="请输入计划明细ID,关联pd_base_plan_detail的plan_detail_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="所属工位关联pd_base_station_info的station_id" prop="stationId">
<el-input
v-model="queryParams.stationId"
placeholder="请输入所属工位关联pd_base_station_info的station_id"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="成品ID,关联物料表物料id" prop="productId">
<el-input
v-model="queryParams.productId"
placeholder="请输入成品ID,关联物料表物料id"
<el-form-item label="出库类型" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择出库类型"
clearable
@keyup.enter.native="handleQuery"
/>
style="width: 240px"
>
<el-option
v-for="dict in dict.type.wms_raw_outstock_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="申请人" prop="applyBy">
<el-input
@ -73,148 +59,34 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="申请时间" prop="applyDate">
<el-date-picker clearable
v-model="queryParams.applyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item>
<el-form-item label="审核人" prop="auditBy">
<el-input
v-model="queryParams.auditBy"
placeholder="请输入审核人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="审核时间" prop="auditDate">
<el-date-picker clearable
v-model="queryParams.auditDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审核时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后更新时间" prop="updateDate">
<el-date-picker clearable
v-model="queryParams.updateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行开始时间" prop="beginTime">
<el-date-picker clearable
v-model="queryParams.beginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择执行开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行结束时间" prop="endTime">
<el-date-picker clearable
v-model="queryParams.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择执行结束时间">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['wms:rawoutstock:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="el-icon-edit"
size="mini"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['wms:rawoutstock:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="el-icon-delete"
size="mini"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['wms:rawoutstock:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
v-hasPermi="['wms:rawoutstock:export']"
>导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="rawoutstockList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="原材料出库记录ID" align="center" prop="rawOutstockId" />
<el-table-column label="任务编号;移库时必须" align="center" prop="taskCode" />
<el-table-column label="仓库ID;领料时需要保存" align="center" prop="warehouseId" />
<el-table-column label="库位编码;移库和合库时需要保存" align="center" prop="locationCode" />
<el-table-column label="工单ID,关联pd_base_order_info的order_id" align="center" prop="orderId" />
<el-table-column label="计划ID,关联pd_base_plan_info的plan_id" align="center" prop="planId" />
<el-table-column label="计划明细ID,关联pd_base_plan_detail的plan_detail_id" align="center" prop="planDetailId" />
<el-table-column label="所属工位关联pd_base_station_info的station_id" align="center" prop="stationId" />
<el-table-column label="成品ID,关联物料表物料id" align="center" prop="productId" />
<el-table-column label="操作类型(0自动,1手动,2强制,3调度)" align="center" prop="operationType" />
<el-table-column label="任务类型(1生产领料,2移库出库,3合库出库,9其他领料)" align="center" prop="taskType" />
<el-table-column label="申请原因" align="center" prop="applyReason" />
<el-table-column label="审核原因" align="center" prop="auditReason" />
<el-table-column label="审核状态(0待审核,1审核通过,2审核未通过)" align="center" prop="auditStatus" />
<el-table-column label="执行状态(0待执行,1执行中,2执行完成)" align="center" prop="executeStatus" />
<el-table-column label="申请人" align="center" prop="applyBy" />
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="审核人" align="center" prop="auditBy" />
<el-table-column label="审核时间" align="center" prop="auditDate" width="180">
<el-table-column label="任务编号" align="center" prop="taskCode" />
<el-table-column label="仓库名称" align="center" prop="warehouseName" />
<el-table-column label="计划编号" align="center" prop="planCode" />
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" />
<el-table-column label="出库类型" align="center" prop="auditStatus" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.auditDate, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="scope.row.taskType"/>
</template>
</el-table-column>
<el-table-column label="最后更新时间" align="center" prop="updateDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.updateDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="执行开始时间" align="center" prop="beginTime" width="180">
<el-table-column label="申请人" align="center" prop="applyBy" />
<el-table-column label="申请原因" align="center" prop="applyReason" />
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.beginTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="执行结束时间" align="center" prop="endTime" width="180">
<el-table-column label="审核状态" align="center" prop="auditStatus" >
<template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
<dict-tag :options="dict.type.wms_audit_status" :value="scope.row.auditStatus"/>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -222,25 +94,11 @@
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:rawoutstock:edit']"
>明细</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['wms:rawoutstock:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['wms:rawoutstock:remove']"
>删除</el-button>
icon="el-icon-lock"
@click="handleAudit(scope.row)"
v-hasPermi="['wms:rawoutstock:audit:query']"
v-if="scope.row.auditStatus=='0'"
>审核</el-button>
</template>
</el-table-column>
</el-table>
@ -253,203 +111,15 @@
@pagination="getList"
/>
<!-- 添加或修改原材料出库记录对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="任务编号;移库时必须" prop="taskCode">
<el-input v-model="form.taskCode" placeholder="请输入任务编号;移库时必须" />
</el-form-item>
<el-form-item label="仓库ID;领料时需要保存" prop="warehouseId">
<el-input v-model="form.warehouseId" placeholder="请输入仓库ID;领料时需要保存" />
</el-form-item>
<el-form-item label="库位编码;移库和合库时需要保存" prop="locationCode">
<el-input v-model="form.locationCode" placeholder="请输入库位编码;移库和合库时需要保存" />
</el-form-item>
<el-form-item label="工单ID,关联pd_base_order_info的order_id" prop="orderId">
<el-input v-model="form.orderId" placeholder="请输入工单ID,关联pd_base_order_info的order_id" />
</el-form-item>
<el-form-item label="计划ID,关联pd_base_plan_info的plan_id" prop="planId">
<el-input v-model="form.planId" placeholder="请输入计划ID,关联pd_base_plan_info的plan_id" />
</el-form-item>
<el-form-item label="计划明细ID,关联pd_base_plan_detail的plan_detail_id" prop="planDetailId">
<el-input v-model="form.planDetailId" placeholder="请输入计划明细ID,关联pd_base_plan_detail的plan_detail_id" />
</el-form-item>
<el-form-item label="所属工位关联pd_base_station_info的station_id" prop="stationId">
<el-input v-model="form.stationId" placeholder="请输入所属工位关联pd_base_station_info的station_id" />
</el-form-item>
<el-form-item label="成品ID,关联物料表物料id" prop="productId">
<el-input v-model="form.productId" placeholder="请输入成品ID,关联物料表物料id" />
</el-form-item>
<el-form-item label="申请原因" prop="applyReason">
<el-input v-model="form.applyReason" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="审核原因" prop="auditReason">
<el-input v-model="form.auditReason" type="textarea" placeholder="请输入内容" />
</el-form-item>
<el-form-item label="申请人" prop="applyBy">
<el-input v-model="form.applyBy" placeholder="请输入申请人" />
</el-form-item>
<el-form-item label="申请时间" prop="applyDate">
<el-date-picker clearable
v-model="form.applyDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择申请时间">
</el-date-picker>
</el-form-item>
<el-form-item label="审核人" prop="auditBy">
<el-input v-model="form.auditBy" placeholder="请输入审核人" />
</el-form-item>
<el-form-item label="审核时间" prop="auditDate">
<el-date-picker clearable
v-model="form.auditDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择审核时间">
</el-date-picker>
</el-form-item>
<el-form-item label="最后更新时间" prop="updateDate">
<el-date-picker clearable
v-model="form.updateDate"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择最后更新时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行开始时间" prop="beginTime">
<el-date-picker clearable
v-model="form.beginTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择执行开始时间">
</el-date-picker>
</el-form-item>
<el-form-item label="执行结束时间" prop="endTime">
<el-date-picker clearable
v-model="form.endTime"
type="date"
value-format="yyyy-MM-dd"
placeholder="请选择执行结束时间">
</el-date-picker>
</el-form-item>
<el-divider content-position="center">原材料出库记录明细信息</el-divider>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAddWmsRawOutstockDetail"></el-button>
</el-col>
<el-col :span="1.5">
<el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDeleteWmsRawOutstockDetail"></el-button>
</el-col>
</el-row>
<el-table :data="wmsRawOutstockDetailList" :row-class-name="rowWmsRawOutstockDetailIndex" @selection-change="handleWmsRawOutstockDetailSelectionChange" ref="wmsRawOutstockDetail">
<el-table-column type="selection" width="50" align="center" />
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="库位编码" prop="locationCode" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.locationCode" placeholder="请输入库位编码" />
</template>
</el-table-column>
<el-table-column label="物料条码" prop="materialBarcode" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.materialBarcode" placeholder="请输入物料条码" />
</template>
</el-table-column>
<el-table-column label="物料ID" prop="materialId" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.materialId" placeholder="请输入物料ID" />
</template>
</el-table-column>
<el-table-column label="批次;扫描条码时,从打印条码记录表中获取" prop="instockBatch" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.instockBatch" placeholder="请输入批次;扫描条码时,从打印条码记录表中获取" />
</template>
</el-table-column>
<el-table-column label="生产日期;扫描条码时,从打印条码记录表中获取" prop="materialProductionDate" width="240">
<template slot-scope="scope">
<el-date-picker clearable v-model="scope.row.materialProductionDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择生产日期;扫描条码时,从打印条码记录表中获取" />
</template>
</el-table-column>
<el-table-column label="计划数量" prop="planAmount" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.planAmount" placeholder="请输入计划数量" />
</template>
</el-table-column>
<el-table-column label="出库数量" prop="outstockAmount" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.outstockAmount" placeholder="请输入出库数量" />
</template>
</el-table-column>
<el-table-column label="执行状态(0待执行,1执行中,2执行完成)" prop="executeStatus" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.executeStatus" placeholder="请选择执行状态(0待执行,1执行中,2执行完成)">
<el-option label="请选择字典生成" value="" />
</el-select>
</template>
</el-table-column>
<el-table-column label="同步ERP状态(0:失败,1成功)" prop="erpStatus" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.erpStatus" placeholder="请选择同步ERP状态(0:失败,1成功)">
<el-option label="请选择字典生成" value="" />
</el-select>
</template>
</el-table-column>
<el-table-column label="出库人" prop="outstockPerson" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.outstockPerson" placeholder="请输入出库人" />
</template>
</el-table-column>
<el-table-column label="出库时间" prop="outstockTime" width="240">
<template slot-scope="scope">
<el-date-picker clearable v-model="scope.row.outstockTime" type="date" value-format="yyyy-MM-dd" placeholder="请选择出库时间" />
</template>
</el-table-column>
<el-table-column label="出库方式" prop="outstockWay" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.outstockWay" placeholder="请输入出库方式" />
</template>
</el-table-column>
<el-table-column label="使用机台名称;出库扫描条码时,从打印条码记录表中获取" prop="machineName" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.machineName" placeholder="请输入使用机台名称;出库扫描条码时,从打印条码记录表中获取" />
</template>
</el-table-column>
<el-table-column label="质检状态(0:待质检,1:合格,2:NG)" prop="qualityStatus" width="150">
<template slot-scope="scope">
<el-select v-model="scope.row.qualityStatus" placeholder="请选择质检状态(0:待质检,1:合格,2:NG)">
<el-option label="请选择字典生成" value="" />
</el-select>
</template>
</el-table-column>
<el-table-column label="创建时间" prop="createDate" width="240">
<template slot-scope="scope">
<el-date-picker clearable v-model="scope.row.createDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择创建时间" />
</template>
</el-table-column>
<el-table-column label="最后更新时间" prop="updateDate" width="240">
<template slot-scope="scope">
<el-date-picker clearable v-model="scope.row.updateDate" type="date" value-format="yyyy-MM-dd" placeholder="请选择最后更新时间" />
</template>
</el-table-column>
<el-table-column label="每托数量" prop="stackAmount" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.stackAmount" placeholder="请输入每托数量" />
</template>
</el-table-column>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listRawoutstock, getRawoutstock, delRawoutstock, addRawoutstock, updateRawoutstock } from "@/api/wms/rawoutstock";
import { auditListRawoutstock,getWarehouses4Audit } from "@/api/wms/rawoutstock";
export default {
name: "Rawoutstock",
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_outstock_task_type'],
data() {
return {
//
@ -482,15 +152,20 @@ export default {
warehouseId: null,
locationCode: null,
orderId: null,
planId: null,
planDetailId: null,
planCode: null,
planDetailCode: null,
stationId: null,
productId: null,
materialBatch: null,
palletInfoCode: null,
outstockAmount: null,
realOutstockAmount: null,
endStationCode: null,
operationType: null,
taskType: null,
applyReason: null,
auditReason: null,
auditStatus: null,
auditStatus: '0',
executeStatus: null,
applyBy: null,
applyDate: null,
@ -502,30 +177,39 @@ export default {
},
//
form: {},
//
rules: {
taskCode: [
{ required: true, message: "任务编号;移库时必须不能为空", trigger: "blur" }
],
warehouseId: [
{ required: true, message: "仓库ID;领料时需要保存不能为空", trigger: "blur" }
],
}
//
warehouseOptions: [],
};
},
created() {
this.getList();
this.getWarehouseList();
},
activated() {
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
this.queryParams.pageNum = Number(this.$route.query.pageNum);
this.getList();
}
},
methods: {
/** 查询原材料出库记录列表 */
getList() {
this.loading = true;
listRawoutstock(this.queryParams).then(response => {
auditListRawoutstock(this.queryParams).then(response => {
this.rawoutstockList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询仓库列表 */
getWarehouseList() {
getWarehouses4Audit().then(response => {
this.warehouseOptions = response.data;
});
},
//
cancel() {
this.open = false;
@ -539,10 +223,15 @@ export default {
warehouseId: null,
locationCode: null,
orderId: null,
planId: null,
planDetailId: null,
planCode: null,
planDetailCode: null,
stationId: null,
productId: null,
materialBatch: null,
palletInfoCode: null,
outstockAmount: null,
realOutstockAmount: null,
endStationCode: null,
operationType: null,
taskType: null,
applyReason: null,
@ -583,90 +272,15 @@ export default {
this.open = true;
this.title = "添加原材料出库记录";
},
/** 修改按钮操作 */
handleUpdate(row) {
/** 审核按钮操作 */
handleAudit(row) {
this.reset();
const rawOutstockId = row.rawOutstockId || this.ids
getRawoutstock(rawOutstockId).then(response => {
this.form = response.data;
this.wmsRawOutstockDetailList = response.data.wmsRawOutstockDetailList;
this.open = true;
this.title = "修改原材料出库记录";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
this.form.wmsRawOutstockDetailList = this.wmsRawOutstockDetailList;
if (this.form.rawOutstockId != null) {
updateRawoutstock(this.form).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
addRawoutstock(this.form).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
}
}
});
},
/** 删除按钮操作 */
handleDelete(row) {
const rawOutstockIds = row.rawOutstockId || this.ids;
this.$modal.confirm('是否确认删除原材料出库记录编号为"' + rawOutstockIds + '"的数据项?').then(function() {
return delRawoutstock(rawOutstockIds);
}).then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
},
/** 原材料出库记录明细序号 */
rowWmsRawOutstockDetailIndex({ row, rowIndex }) {
row.index = rowIndex + 1;
},
/** 原材料出库记录明细添加按钮操作 */
handleAddWmsRawOutstockDetail() {
let obj = {};
obj.locationCode = "";
obj.materialBarcode = "";
obj.materialId = "";
obj.instockBatch = "";
obj.materialProductionDate = "";
obj.planAmount = "";
obj.outstockAmount = "";
obj.executeStatus = "";
obj.erpStatus = "";
obj.outstockPerson = "";
obj.outstockTime = "";
obj.outstockWay = "";
obj.machineName = "";
obj.qualityStatus = "";
obj.createDate = "";
obj.updateDate = "";
obj.stackAmount = "";
this.wmsRawOutstockDetailList.push(obj);
},
/** 原材料出库记录明细删除按钮操作 */
handleDeleteWmsRawOutstockDetail() {
if (this.checkedWmsRawOutstockDetail.length == 0) {
this.$modal.msgError("请先选择要删除的原材料出库记录明细数据");
} else {
const wmsRawOutstockDetailList = this.wmsRawOutstockDetailList;
const checkedWmsRawOutstockDetail = this.checkedWmsRawOutstockDetail;
this.wmsRawOutstockDetailList = wmsRawOutstockDetailList.filter(function(item) {
return checkedWmsRawOutstockDetail.indexOf(item.index) == -1
});
}
},
/** 复选框选中数据 */
handleWmsRawOutstockDetailSelectionChange(selection) {
this.checkedWmsRawOutstockDetail = selection.map(item => item.index)
const taskCode = row.taskCode
const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("领料审核[" + taskCode + "]", '/wms/raw-outstock/audit/' + taskCode+'/0/'+warehouseName, params);
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/rawoutstock/export', {

@ -0,0 +1,221 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="任务编号" prop="taskCode">
<el-input v-model="form.taskCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="仓库" prop="warehouseName">
<el-input v-model="form.warehouseName" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="明细编号" prop="planDetailCode">
<el-input v-model="form.planDetailCode" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="申请人" prop="applyBy">
<el-input v-model="form.applyBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="申请时间" prop="applyDate">
<el-input v-model="form.applyDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="申请原因" prop="applyReason">
<el-input v-model="form.applyReason" type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="8" :offset="2">
<el-form-item label="审核人" prop="auditBy">
<el-input v-model="form.auditBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="审核时间" prop="auditDate">
<el-input v-model="form.auditDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="出库类型" prop="taskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_outstock_task_type" :value="form.taskType"/>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="审核原因" prop="auditReason">
<el-input v-model="form.auditReason" type="textarea" :disabled="detailFlag"/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="16" :offset="2">
<el-form-item label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="form.auditStatus"/>
</template>
</el-form-item>
</el-col>
</el-row>
<el-divider content-position="center">原材料申请明细信息</el-divider>
<el-table :data="wmsRawOutstockDetailList" :row-class-name="rowWmsRawOutstockDetailIndex"
ref="wmsRawOutstockDetail">
<el-table-column label="序号" align="center" prop="index" width="50"/>
<el-table-column label="库位编码" prop="locationCode"/>
<el-table-column label="物料名称" prop="materialName"/>
<el-table-column label="物料批次" prop="instockBatch"/>
<el-table-column label="计划数量" prop="planAmount"/>
<el-table-column label="出库数量" prop="outstockAmount" v-if="detailFlag"/>
<el-table-column label="执行状态" prop="executeStatus" v-if="detailFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="scope.row.executeStatus"/>
</template>
</el-table-column>
<el-table-column label="同步ERP状态" prop="erpStatus" v-if="detailFlag">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_erp_status" :value="scope.row.erpStatus"/>
</template>
</el-table-column>
<el-table-column label="同步ERP数量" prop="erpAmount" v-if="detailFlag"/>
</el-table>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="auditPass" v-if="!detailFlag"></el-button>
<el-button type="primary" @click="auditFail" v-if="!detailFlag"></el-button>
<el-button @click="cancel"> </el-button>
</div>
</div>
</template>
<script>
import {
getRawOutstockByTaskCode,
auditRawOutstock,
} from "@/api/wms/rawoutstock";
export default {
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_erp_status','wms_raw_outstock_task_type'],
name: "Rawoutstock",
data() {
return {
//
loading: true,
//
ids: [],
//
checkedWmsRawOutstockDetail: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
//
rawoutstockList: [],
//
wmsRawOutstockDetailList: [],
//
title: "",
//
open: false,
//
form: {},
detailFlag: true,
warehouseName: '',
};
},
created() {
const taskCode = this.$route.params && this.$route.params.taskCode;
const detailFlag = this.$route.params && this.$route.params.detailFlag;
const warehouseName = this.$route.params && this.$route.params.warehouseName;
this.detailFlag = detailFlag == "1";
this.form.taskCode = taskCode;
this.warehouseName = warehouseName;
this.getRawOutstockByTaskCode();
},
methods: {
/** 根据任务编号获取出库明细 */
getRawOutstockByTaskCode() {
getRawOutstockByTaskCode(this.form.taskCode).then(response => {
this.form = response.data.wmsRawOutstock;
this.form.warehouseName = this.warehouseName;
this.wmsRawOutstockDetailList = response.data.wmsRawOutstockDetailList;
this.open = true;
this.title = "修改原材料出库记录";
});
},
/** 原材料出库记录明细序号 */
rowWmsRawOutstockDetailIndex({row, rowIndex}) {
row.index = rowIndex + 1;
},
//
cancel() {
const obj = {path: "/wms/rawmanagement/rawoutstock", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
this.$tab.closeOpenPage(obj);
},
auditPass() {
this.form.auditStatus = "1";
this.submitForm();
},
auditFail() {
this.form.auditStatus = "2";
if (!this.form.auditReason || this.form.auditReason == "" || this.form.auditReason == undefined) {
this.$modal.msgWarning("请输入审核原因!");
return;
}
this.submitForm();
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
auditRawOutstock(this.form).then(response => {
this.$modal.msgSuccess("保存成功");
this.cancel();
});
}
});
},
}
};
</script>

@ -0,0 +1,254 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="任务编号" prop="taskCode">
<el-input
v-model="queryParams.taskCode"
placeholder="请输入任务编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="仓库" prop="warehouseId">
<el-select v-model="queryParams.warehouseId">
<el-option
v-for="item in warehouseOptions"
:key="item.warehouseId"
:label="item.warehouseName"
:value="item.warehouseId"
/>
</el-select>
</el-form-item>
<el-form-item label="计划编号" prop="planCode">
<el-input
v-model="queryParams.planCode"
placeholder="请输入计划编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="明细编号" prop="planDetailCode">
<el-input
v-model="queryParams.planDetailCode"
placeholder="请输入计划明细编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="物料条码" prop="materialBarcode">
<el-input
v-model="queryParams.materialBarcode"
placeholder="请输入物料条码"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="退库类型" prop="taskType">
<el-select
v-model="queryParams.taskType"
placeholder="请选择退库类型"
clearable
style="width: 240px"
>
<el-option
v-for="dict in dict.type.wms_raw_return_task_type"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="申请人" prop="applyBy">
<el-input
v-model="queryParams.applyBy"
placeholder="请输入申请人"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"></el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="rawreturnList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="任务编号" align="center" prop="taskCode" />
<el-table-column label="仓库" align="center" prop="warehouseName" />
<el-table-column label="计划编号" align="center" prop="planCode" />
<el-table-column label="计划明细编号" align="center" prop="planDetailCode" />
<el-table-column label="物料条码" align="center" prop="materialBarcode" />
<el-table-column label="计划退库数量" align="center" prop="planAmount" />
<el-table-column label="任务类型" align="center" prop="taskType" >
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_return_task_type" :value="scope.row.taskType"/>
</template>
</el-table-column>
<el-table-column label="申请人" align="center" prop="applyBy" />
<el-table-column label="申请时间" align="center" prop="applyDate" width="180">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.applyDate, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="申请原因" align="center" prop="applyReason" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button
size="mini"
type="text"
icon="el-icon-lock"
@click="handleAudit(scope.row)"
v-hasPermi="['wms:rawreturn:audit:query']"
>审核</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
</div>
</template>
<script>
import { auditListRawreturn,getWarehouses4Audit } from "@/api/wms/rawreturn";
export default {
name: "Rawreturn",
dicts: ['wms_audit_status', 'wms_execute_status', 'wms_raw_return_task_type'],
data() {
return {
//
loading: true,
//
ids: [],
//
checkedWmsRawReturnDetail: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 退
rawreturnList: [],
// 退
wmsRawReturnDetailList: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNum: 1,
pageSize: 10,
taskCode: null,
warehouseId: null,
locationCode: null,
planCode: null,
planDetailCode: null,
productId: null,
materialId: null,
materialBarcode: null,
batchCode: null,
planAmount: null,
returnAmount: null,
operationType: null,
taskType: null,
endStationCode: null,
applyReason: null,
auditReason: null,
auditStatus: '0',
executeStatus: null,
applyBy: null,
applyDate: null,
auditBy: null,
auditDate: null,
updateDate: null,
beginTime: null,
endTime: null,
erpStatus: null,
erpAmount: null
},
//
form: {},
//
//
warehouseOptions: [],
};
},
created() {
this.getList();
this.getWarehouseList();
},
activated() {
const time = this.$route.query.t;
if (time != null && time != this.uniqueId) {
this.uniqueId = time;
this.queryParams.pageNum = Number(this.$route.query.pageNum);
this.getList();
}
},
methods: {
/** 查询原材料退库记录列表 */
getList() {
this.loading = true;
auditListRawreturn(this.queryParams).then(response => {
this.rawreturnList = response.rows;
this.total = response.total;
this.loading = false;
});
},
/** 查询仓库列表 */
getWarehouseList() {
getWarehouses4Audit().then(response => {
this.warehouseOptions = response.data;
});
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNum = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
//
handleSelectionChange(selection) {
this.ids = selection.map(item => item.rawReturnId)
this.single = selection.length!==1
this.multiple = !selection.length
},
/** 审核按钮操作 */
handleAudit(row) {
const rawReturnId = row.rawReturnId
const taskCode = row.taskCode
const warehouseName = row.warehouseName;
const params = {pageNum: this.queryParams.pageNum};
this.$tab.openPage("退库审核[" + taskCode + "]", '/wms/raw-return/audit/' + rawReturnId+'/0/'+warehouseName, params);
},
/** 导出按钮操作 */
handleExport() {
this.download('wms/rawreturn/export', {
...this.queryParams
}, `rawreturn_${new Date().getTime()}.xlsx`)
}
}
};
</script>

@ -0,0 +1,284 @@
<template>
<div class="app-container">
<el-form ref="form" :model="form" label-width="100px">
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="任务编号" prop="taskCode">
<el-input v-model="form.taskCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="仓库" prop="warehouseName">
<el-input v-model="form.warehouseName" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划编号" prop="planCode">
<el-input v-model="form.planCode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="明细编号" prop="planDetailCode">
<el-input v-model="form.planDetailCode" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="成品名称" prop="productName">
<el-input v-model="form.productName" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="物料名称" prop="materialName">
<el-input v-model="form.materialName" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="物料条码" prop="materialBarcode">
<el-input v-model="form.materialBarcode" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="批次码" prop="batchCode">
<el-input v-model="form.batchCode" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="计划退库数量" prop="planAmount">
<el-input v-model="form.planAmount" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2" v-if="detailFlag">
<el-form-item label="已退库数量" prop="returnAmount">
<el-input v-model="form.returnAmount" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8" :offset="2">
<el-form-item label="申请人" prop="applyBy">
<el-input v-model="form.applyBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="申请时间" prop="applyDate">
<el-input v-model="form.applyDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="申请原因" prop="applyReason">
<el-input v-model="form.applyReason" type="textarea" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="退库类型" prop="taskType">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_raw_return_task_type" :value="form.taskType"/>
</template>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="8" :offset="2">
<el-form-item label="审核人" prop="auditBy">
<el-input v-model="form.auditBy" disabled/>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="审核时间" prop="auditDate">
<el-input v-model="form.auditDate" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="16" :offset="2">
<el-form-item label="审核原因" prop="auditReason">
<el-input v-model="form.auditReason" type="textarea" :disabled="detailFlag"/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="16" :offset="2">
<el-form-item label="同步ERP数量" prop="erpAmount">
<el-input v-model="form.erpAmount" disabled/>
</el-form-item>
</el-col>
</el-row>
<el-row v-if="detailFlag">
<el-col :span="8" :offset="2">
<el-form-item label="审核状态" prop="auditStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_audit_status" :value="form.auditStatus"/>
</template>
</el-form-item>
</el-col>
<el-col :span="8" :offset="2">
<el-form-item label="执行状态" prop="executeStatus">
<template slot-scope="scope">
<dict-tag :options="dict.type.wms_execute_status" :value="form.executeStatus"/>
</template>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="auditPass" v-if="!detailFlag"></el-button>
<el-button type="primary" @click="auditFail" v-if="!detailFlag"></el-button>
<el-button @click="cancel"> </el-button>
</div>
</div>
</template>
<script>
import {auditRawReturn, getRawreturn4Audit} from "@/api/wms/rawreturn";
export default {
name: "Rawreturn",
dicts: ["wms_audit_status","wms_erp_status","wms_execute_status","wms_raw_return_task_type"],
data() {
return {
//
loading: true,
//
ids: [],
//
checkedWmsRawReturnDetail: [],
//
single: true,
//
multiple: true,
//
showSearch: true,
//
total: 0,
// 退
rawreturnList: [],
// 退
wmsRawReturnDetailList: [],
//
title: "",
//
open: false,
//
form: {},
//
detailFlag: true,
rawReturnId: null,
};
},
created() {
const rawReturnId = this.$route.params && this.$route.params.rawReturnId;
const taskCode = this.$route.params && this.$route.params.taskCode;
const detailFlag = this.$route.params && this.$route.params.detailFlag;
const warehouseName = this.$route.params && this.$route.params.warehouseName;
this.detailFlag = detailFlag == "1";
this.form.taskCode = taskCode;
this.warehouseName = warehouseName;
this.rawReturnId = rawReturnId;
this.getRawReturn();
},
methods: {
/** 查询原材料退库记录列表 */
getRawReturn() {
this.loading = true;
getRawreturn4Audit(this.rawReturnId).then(response => {
this.form = response.data;
this.form.warehouseName = this.warehouseName;
this.loading = false;
});
},
//
cancel() {
const obj = {path: "/wms/rawmanagement/rawreturn", query: {t: Date.now(), pageNum: this.$route.query.pageNum}};
this.$tab.closeOpenPage(obj);
},
//
reset() {
this.form = {
rawReturnId: null,
taskCode: null,
warehouseId: null,
locationCode: null,
planCode: null,
planDetailCode: null,
productId: null,
materialId: null,
materialBarcode: null,
batchCode: null,
planAmount: null,
returnAmount: null,
operationType: null,
taskType: null,
endStationCode: null,
applyReason: null,
auditReason: null,
auditStatus: null,
executeStatus: null,
applyBy: null,
applyDate: null,
auditBy: null,
auditDate: null,
updateBy: null,
updateDate: null,
beginTime: null,
endTime: null,
erpStatus: null,
erpAmount: null
};
this.wmsRawReturnDetailList = [];
this.resetForm("form");
},
auditPass() {
this.form.auditStatus = "1";
this.submitForm();
},
auditFail() {
this.form.auditStatus = "2";
if (!this.form.auditReason || this.form.auditReason == "" || this.form.auditReason == undefined) {
this.$modal.msgWarning("请输入审核原因!");
return;
}
this.submitForm();
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
auditRawReturn(this.form).then(response => {
this.$modal.msgSuccess("保存成功");
this.cancel();
});
}
});
},
}
};
</script>
Loading…
Cancel
Save