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

单据字段调整，子单货位分配，定时作业

Browse Source
This commit is contained in:
lsymicc
2025-12-10 09:20:41 +08:00
parent 4e79dcb95f
commit 51c8764a34
23 changed files with 450 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/controller/ErpInStockinController.java
View File

@@ -66,7 +66,7 @@ public class ErpInStockinController extends BaseController
@GetMapping(value = "/{title}")
public AjaxResult getInfo(@PathVariable("title") String title)
{
return success(erpInStockinService.selectErpInStockinByKuin(title));
return success(erpInStockinService.selectErpInStockinByStockinGuid(title));
}
/**
@@ -99,6 +99,6 @@ public class ErpInStockinController extends BaseController
@DeleteMapping("/{titles}")
public AjaxResult remove(@PathVariable String[] kuins)
{
return toAjax(erpInStockinService.deleteErpInStockinByKuins(kuins));
return toAjax(erpInStockinService.deleteErpInStockinByStockinGuids(kuins));
}
}

4
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/domain/ErpInStockin.java
View File

@@ -74,7 +74,9 @@ public class ErpInStockin extends BaseEntity
@Excel(name = "入库编号")
private String rkbh;
/** 审批状态 */
/**
* 审批状态 - 请求【确认入库】时需要
*/
@Excel(name = "审批状态")
private String status;

26
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/mapper/ErpInStockinMapper.java
View File

@@ -14,11 +14,27 @@ public interface ErpInStockinMapper
/**
* 查询入库主表单
*
* @param kuin 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByStockinGuid(String stockinGuid);
/**
* 查询入库主表单
*
* @param kuin 入库id
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByKuin(String kuin);
/**
* 查询入库主表单
*
* @param rkbh 入库编号
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByRkbh(String rkbh);
/**
* 查询入库主表单列表
*
@@ -54,16 +70,16 @@ public interface ErpInStockinMapper
/**
* 删除入库主表单
*
* @param kuin 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 结果
*/
public int deleteErpInStockinByKuin(String kuin);
public int deleteErpInStockinByStockinGuid(String stockinGuid);
/**
* 批量删除入库主表单
*
* @param kuins 需要删除的数据主键集合
* @param stockinGuids 需要删除的数据主键集合
* @return 结果
*/
public int deleteErpInStockinByKuins(String[] kuins);
public int deleteErpInStockinByStockinGuids(String[] stockinGuids);
}

26
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/IErpInStockinService.java
View File

@@ -14,11 +14,27 @@ public interface IErpInStockinService
/**
* 查询入库主表单
*
* @param kuin 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByStockinGuid(String stockinGuid);
/**
* 查询入库主表单
*
* @param kuin 入库id
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByKuin(String kuin);
/**
* 查询入库主表单
*
* @param rkbh 入库编号
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByRkbh(String rkbh);
/**
* 查询入库主表单列表
*
@@ -54,16 +70,16 @@ public interface IErpInStockinService
/**
* 批量删除入库主表单
*
* @param kuins 需要删除的入库主表单主键集合
* @param stockinGuids 需要删除的入库主表单主键集合
* @return 结果
*/
public int deleteErpInStockinByKuins(String[] kuins);
public int deleteErpInStockinByStockinGuids(String[] stockinGuids);
/**
* 删除入库主表单信息
*
* @param kuin 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 结果
*/
public int deleteErpInStockinByKuin(String kuin);
public int deleteErpInStockinByStockinGuid(String stockinGuid);
}

38
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockin/service/impl/ErpInStockinServiceImpl.java
View File

@@ -22,13 +22,33 @@ public class ErpInStockinServiceImpl implements IErpInStockinService
/**
* 查询入库主表单
*
* @param stockinId 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 入库主表单
*/
@Override
public ErpInStockin selectErpInStockinByKuin(String stockinId)
public ErpInStockin selectErpInStockinByStockinGuid(String stockinGuid)
{
return erpInStockinMapper.selectErpInStockinByKuin(stockinId);
return erpInStockinMapper.selectErpInStockinByStockinGuid(stockinGuid);
}
/**
* 查询入库主表单
*
* @param kuin 入库id
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByKuin(String kuin){
return erpInStockinMapper.selectErpInStockinByKuin(kuin);
}
/**
* 查询入库主表单
*
* @param rkbh 入库编号
* @return 入库主表单
*/
public ErpInStockin selectErpInStockinByRkbh(String rkbh){
return erpInStockinMapper.selectErpInStockinByRkbh(rkbh);
}
/**
@@ -81,24 +101,24 @@ public class ErpInStockinServiceImpl implements IErpInStockinService
/**
* 批量删除入库主表单
*
* @param stockinIds 需要删除的入库主表单主键
* @param stockinGuids 需要删除的入库主表单主键
* @return 结果
*/
@Override
public int deleteErpInStockinByKuins(String[] kuins)
public int deleteErpInStockinByStockinGuids(String[] stockinGuids)
{
return erpInStockinMapper.deleteErpInStockinByKuins(kuins);
return erpInStockinMapper.deleteErpInStockinByStockinGuids(stockinGuids);
}
/**
* 删除入库主表单信息
*
* @param stockinId 入库主表单主键
* @param stockinGuid 入库主表单主键
* @return 结果
*/
@Override
public int deleteErpInStockinByKuin(String kuin)
public int deleteErpInStockinByStockinGuid(String stockinGuid)
{
return erpInStockinMapper.deleteErpInStockinByKuin(kuin);
return erpInStockinMapper.deleteErpInStockinByStockinGuid(stockinGuid);
}
}

10
ruoyi-admin/src/main/java/com/ruoyi/in/ErpInStockinDetail/domain/ErpInStockinDetail.java
View File

@@ -39,7 +39,7 @@ public class ErpInStockinDetail extends BaseEntity
/** 库位id */
@Excel(name = "库位id")
private Long warehousePositionID;
private String warehousePositionID;
/** 批号 */
@Excel(name = "批号")
@@ -66,11 +66,11 @@ public class ErpInStockinDetail extends BaseEntity
private String sysIcusIInheritIdIidI1;
/** 入库单id（关联主单） */
@Excel(name = "入库单id", readConverterExp = "关=联主单")
@Excel(name = "入库单id", readConverterExp = "关联主单")
private String kuin;
/** 入库编号（关联主单） */
@Excel(name = "入库编号", readConverterExp = "关=联主单")
@Excel(name = "入库编号", readConverterExp = "关联主单")
private String rkbh;
/**
@@ -140,12 +140,12 @@ public class ErpInStockinDetail extends BaseEntity
return ku;
}
public void setWarehousePositionID(Long warehousePositionID)
public void setWarehousePositionID(String warehousePositionID)
{
this.warehousePositionID = warehousePositionID;
}
public Long getWarehousePositionID()
public String getWarehousePositionID()
{
return warehousePositionID;
}

9
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/mapper/InStockinDetailMapper.java
View File

@@ -22,6 +22,15 @@ public interface InStockinDetailMapper
*/
public InStockinDetail selectInStockinDetailByStockinDetailId(String stockinDetailId);
/**
* 查询入库单据子表
*
* @param stockinGuid
* @return 入库单据子表
*/
public InStockinDetail selectInStockinDetailByStockinGuid(String stockinGuid);
/**
* 查询入库单据子表列表
*

8
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/IInStockinDetailService.java
View File

@@ -23,6 +23,14 @@ public interface IInStockinDetailService
*/
public InStockinDetail selectInStockinDetailByStockinDetailId(String stockinDetailId);
/**
* 查询入库单据子表
*
* @param stockinGuid 入库单据子表主键
* @return 入库单据子表
*/
public InStockinDetail selectInStockinDetailByStockinGuid(String stockinGuid);
/**
* 查询入库单据子表列表
*

12
ruoyi-admin/src/main/java/com/ruoyi/in/stockindetail/service/impl/InStockinDetailServiceImpl.java
View File

@@ -40,6 +40,18 @@ public class InStockinDetailServiceImpl implements IInStockinDetailService
return inStockinDetailMapper.selectInStockinDetailByStockinDetailId(stockinDetailId);
}
/**
* 查询入库单据子表
*
* @param stockinGuid
* @return 入库单据子表
*/
@Override
public InStockinDetail selectInStockinDetailByStockinGuid(String stockinGuid)
{
return inStockinDetailMapper.selectInStockinDetailByStockinGuid(stockinGuid);
}
/**
* 查询入库单据子表列表
*