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

手动完成修改

Browse Source
This commit is contained in:
liuhanqing
2025-06-23 14:50:09 +08:00
parent 7defbe45ff
commit db00d83407
5 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/domain/MydoJob.java
View File

@@ -129,6 +129,23 @@ public class MydoJob
private String inOut;
public String getDepartmentName() {
return departmentName;
}
public void setDepartmentName(String departmentName) {
this.departmentName = departmentName;
}
public String getWarehouseName() {
return warehouseName;
}
public void setWarehouseName(String warehouseName) {
this.warehouseName = warehouseName;
}
public String getCreateTime() {
return createTime;
}

16
ruoyi-admin/src/main/java/com/ruoyi/job/mydojob/service/impl/MydoJobServiceImpl.java
View File

@@ -9,6 +9,8 @@ import java.util.List;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.convert.Convert;
import com.ruoyi.bas.basJobId.service.IBasJobIdService;
import com.ruoyi.bas.cargoSpace.domain.BasCargoSpace;
import com.ruoyi.bas.cargoSpace.service.IBasCargoSpaceService;
import com.ruoyi.bas.taskNo.service.IBasTaskNoService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DateUtils;
@@ -50,6 +52,8 @@ public class MydoJobServiceImpl implements IMydoJobService {
private IBasStockService basStockService;
@Autowired
private IOutStockoutDetailService outStockoutDetailService;
@Autowired
private IBasCargoSpaceService basCargoSpaceService;
/**
@@ -188,6 +192,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
basStockService.insertBasStockList(list);
mydoJob.setStatus("4");
updateMydoJob(mydoJob);
//修改货位
BasCargoSpace basCargoSpace = new BasCargoSpace();
basCargoSpace.setStatus("2");
basCargoSpace.setCargoSpaceId(job.getCargoSpaceId());
basCargoSpaceService.updateBasCargoSpace(basCargoSpace);
//插入历史表
insertHistory(mydoJob.getJobId());
}
@@ -202,7 +211,7 @@ public class MydoJobServiceImpl implements IMydoJobService {
stock.setStockStatus("1");
stock.setProductStatus("1");
stock.setLotNo(mydoJobDetail.getLotNo());
stock.setInDate(DateUtils.getDate());
stock.setInDate(DateUtils.getTime());
stock.setProductGuid(mydoJobDetail.getProductGuid());
stock.setQuantity(mydoJobDetail.getInQuantity());
stock.setJobId(mydoJob.getJobId());
@@ -210,6 +219,11 @@ public class MydoJobServiceImpl implements IMydoJobService {
stock.setInClassId(mydoJob.getClassId());
stock.setWarehouseId(mydoJob.getWarehouseId());
stock.setStackingId(mydoJobDetail.getStackingId());
stock.setOutQuantity("0");
stock.setProductId(mydoJobDetail.getProductId());
stock.setStockinId(mydoJobDetail.getInOrOutId());
stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
stock.setInType(mydoJob.getInOrOut());
return stock;
}

2
ruoyi-admin/src/main/java/com/ruoyi/pda/controller/PdaController.java
View File

@@ -184,7 +184,7 @@ public class PdaController extends BaseController {
}
/**
* 出库确认
* 盘点出库确认
* @param trayCodeMakeSure 托盘信息
* @return
*/

10
ruoyi-admin/src/main/java/com/ruoyi/stock/stock/domain/BasStock.java
View File

@@ -123,6 +123,16 @@ public class BasStock extends BaseEntity
//货位库存状态
private String cargoSpaceStockStatus;
private String productId;
public String getProductId() {
return productId;
}
public void setProductId(String productId) {
this.productId = productId;
}
public String getCargoSpaceStockStatus() {
return cargoSpaceStockStatus;
}

26
ruoyi-ui/src/views/check/job/in/index.vue
View File

@@ -256,12 +256,12 @@
<el-table-column :label="$t('checkJobIn.supplier')" align="center" prop="supplierName" key="supplierId" value="supplierName" /> <!--供应商-->
<el-table-column :label="$t('checkJobIn.department')" align="center" prop="departmentName" /> <!--部门-->
<el-table-column :label="$t('checkJobIn.trayCode')" align="center" prop="trayCode" /> <!--托盘码-->
<el-table-column :label="$t('checkJobIn.roadwayId')" align="center" prop="roadwayId" /> <!--巷道ID-->
<!-- <el-table-column :label="$t('checkJobIn.roadwayId')" align="center" prop="roadwayId" /> &lt;!&ndash;巷道ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.cargoSpace')" align="center" prop="cargoSpaceName" /> <!--货位-->
<el-table-column :label="$t('checkJobIn.targetRoadway')" align="center" prop="targetRoadwayId" /> <!--目标巷道-->
<el-table-column :label="$t('checkJobIn.targetCargoSpace')" align="center" prop="targetCargoSpaceName" /> <!--目标货位-->
<el-table-column :label="$t('checkJobIn.lineId')" align="center" prop="lineId" /> <!--产线ID-->
<el-table-column :label="$t('checkJobIn.workshopId')" align="center" prop="workshopId" /> <!--车间ID-->
<!-- <el-table-column :label="$t('checkJobIn.targetRoadway')" align="center" prop="targetRoadwayId" /> &lt;!&ndash;目标巷道&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.targetCargoSpace')" align="center" prop="targetCargoSpaceName" /> &lt;!&ndash;目标货位&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.lineId')" align="center" prop="lineId" /> &lt;!&ndash;产线ID&ndash;&gt;-->
<!-- <el-table-column :label="$t('checkJobIn.workshopId')" align="center" prop="workshopId" /> &lt;!&ndash;车间ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.priority')" align="center" prop="priority" /> <!--优先级-->
<el-table-column :label="$t('checkJobIn.executionPhase')" align="center" prop="executionPhase"> <!--执行阶段-->
<template slot-scope="scope">
@@ -279,10 +279,10 @@
<span>{{ parseTime(scope.row.finishTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column :label="$t('checkJobIn.entranceId')" align="center" prop="entranceId" /> <!--入口ID-->
<el-table-column :label="$t('checkJobIn.classId')" align="center" prop="classId" /> <!--班组ID-->
<el-table-column :label="$t('checkJobIn.warehouseId')" align="center" prop="warehouseId" /> <!--仓库ID-->
<el-table-column :label="$t('checkJobIn.faultFlag')" align="center" prop="faultFlag" /> <!--重分标记-->
<el-table-column :label="$t('checkJobIn.entrance')" align="center" prop="entranceId" /> <!--入口ID-->
<!-- <el-table-column :label="$t('checkJobIn.classId')" align="center" prop="classId" /> &lt;!&ndash;班组ID&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.warehouse')" align="center" prop="warehouseName" /> <!--仓库ID-->
<!-- <el-table-column :label="$t('checkJobIn.faultFlag')" align="center" prop="faultFlag" /> &lt;!&ndash;重分标记&ndash;&gt;-->
</el-table>
<pagination
@@ -312,11 +312,11 @@
<el-table-column :label="$t('checkJobIn.productId')" align="center" prop="productId" /> <!--物料编码-->
<el-table-column :label="$t('checkJobIn.materialDesc')" align="center" prop="extraField.materialDesc" /> // 物料描述
<el-table-column :label="$t('checkJobIn.englishDesc')" align="center" prop="extraField.englishDesc" /> // 英文描述
<el-table-column :label="$t('checkJobIn.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号
<el-table-column :label="$t('checkJobIn.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式
<!-- <el-table-column :label="$t('checkJobIn.cartonNo')" align="center" prop="extraField.cartonNo" /> // 箱号-->
<!-- <el-table-column :label="$t('checkJobIn.packingMethod')" align="center" prop="extraField.packingMethod" /> // 包装方式-->
<el-table-column :label="$t('checkJobIn.netWeight')" align="center" prop="extraField.netWeight" /> // 净重
<el-table-column :label="$t('checkJobIn.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重
<el-table-column :label="$t('checkJobIn.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重
<!-- <el-table-column :label="$t('checkJobIn.totalNetWeight')" align="center" prop="extraField.totalNetWeight" /> // 总净重-->
<!-- <el-table-column :label="$t('checkJobIn.grossWeight')" align="center" prop="extraField.grossWeight" /> // 毛重-->
<!-- <el-table-column :label="$t('checkJobIn.stockStatus')" align="center" prop="stockStatus" /> &lt;!&ndash;库存状态&ndash;&gt;-->
<el-table-column :label="$t('checkJobIn.inQuantity')" align="center" prop="inQuantity" /> <!--入库数量-->
<!-- <el-table-column :label="$t('checkJobIn.printDate')" align="center" prop="printDate" /> &lt;!&ndash;生产日期&ndash;&gt;-->