Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e93d765e 由 LN
选项

入库单增加凭证号

1 个父辈 87ee10ab
内嵌 并排
正在显示 6 个修改的文件 包含 28 行增加 和 6 行删除
src/main/java/com/neotel/smfcore/core/hik/rest/SingleInController.java
...@@ -15,6 +15,7 @@ import com.neotel.smfcore.core.device.enums.OP; ...@@ -15,6 +15,7 @@ import com.neotel.smfcore.core.device.enums.OP;
import com.neotel.smfcore.core.device.enums.OP_STATUS; import com.neotel.smfcore.core.device.enums.OP_STATUS;
import com.neotel.smfcore.core.device.util.DataCache; import com.neotel.smfcore.core.device.util.DataCache;
import com.neotel.smfcore.core.hik.bean.ShelfPosInfo; import com.neotel.smfcore.core.hik.bean.ShelfPosInfo;
import com.neotel.smfcore.core.inList.service.po.InList;
import com.neotel.smfcore.core.inList.util.InListCache; import com.neotel.smfcore.core.inList.util.InListCache;
import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto; import com.neotel.smfcore.core.kanban.rest.bean.dto.BoxStatusDto;
import com.neotel.smfcore.core.storage.bean.UsageItem; import com.neotel.smfcore.core.storage.bean.UsageItem;
...@@ -281,7 +282,9 @@ public class SingleInController { ...@@ -281,7 +282,9 @@ public class SingleInController {
dataLog.setType(OP.PUT_IN); dataLog.setType(OP.PUT_IN);
dataLog.setInType(inType); dataLog.setInType(inType);
if(inType.equals(5)){ if(inType.equals(5)){
InList inList=inListCache.getInList(docName);
dataLog.setSourceName(docName); dataLog.setSourceName(docName);
dataLog.setSubSourceInfo(inList.getDocNo());
} }
barcode.setPutInTime(System.currentTimeMillis()); barcode.setPutInTime(System.currentTimeMillis());
......
src/main/java/com/neotel/smfcore/core/inList/rest/InListController.java
...@@ -103,7 +103,8 @@ public class InListController { ...@@ -103,7 +103,8 @@ public class InListController {
if (inListItems.size() <= 0) { if (inListItems.size() <= 0) {
continue; continue;
} }
InList inList = new InList(name, INLIST_STATUS.WAIT,-1, inListItems); String docNo="";
InList inList = new InList(name,docNo, INLIST_STATUS.WAIT,-1, inListItems);
InList dbList = inListManager.findByName(name); InList dbList = inListManager.findByName(name);
if (dbList != null) { if (dbList != null) {
...@@ -266,14 +267,22 @@ public class InListController { ...@@ -266,14 +267,22 @@ public class InListController {
//新建入库单 //新建入库单
List<InListItem> inListItems = new ArrayList<>(); List<InListItem> inListItems = new ArrayList<>();
String docNo="";
for (TransferOrderInfo obj : for (TransferOrderInfo obj :
inOrderLists) { inOrderLists) {
InListItem item = obj.creatInListItem(); InListItem item = obj.creatInListItem();
item.setName(name); item.setName(name);
inListItems.add(item); inListItems.add(item);
if(ObjectUtil.isEmpty(docNo)){
docNo=obj.getDocNo();
} }
inList = new InList(name, INLIST_STATUS.WAIT, type, inListItems); }
log.info("获取到转储单，新增加入库单:" + inList.getName() + "，共" + inListItems.size() + "条工单详情"); if(name.equals(docNo)){
inList = new InList(name,"", INLIST_STATUS.WAIT, type, inListItems);
}else {
inList = new InList(name,docNo, INLIST_STATUS.WAIT, type, inListItems);
}
log.info("获取到转储单，新增加入库单:" + inList.getName() + "，"+docNo+"，共" + inListItems.size() + "条工单详情");
inList = inListManager.createWithItems(inList); inList = inListManager.createWithItems(inList);
inListCache.addInListToMap(inList); inListCache.addInListToMap(inList);
return ResultBean.newOkResult(name); return ResultBean.newOkResult(name);
......
src/main/java/com/neotel/smfcore/core/inList/rest/bean/dto/InListDto.java
...@@ -19,6 +19,9 @@ public class InListDto implements Serializable { ...@@ -19,6 +19,9 @@ public class InListDto implements Serializable {
@ApiModelProperty(value = "入库单名称") @ApiModelProperty(value = "入库单名称")
private String name; private String name;
@ApiModelProperty(value = "凭证号")
private String docNo;
@ApiModelProperty(value = "入库单状态，0=等待，1=异常，2=OK") @ApiModelProperty(value = "入库单状态，0=等待，1=异常，2=OK")
private int status= INLIST_STATUS.WAIT; private int status= INLIST_STATUS.WAIT;
@ApiModelProperty(value = "创建时间") @ApiModelProperty(value = "创建时间")
......
src/main/java/com/neotel/smfcore/core/inList/service/po/InList.java
...@@ -19,6 +19,11 @@ public class InList extends BasePo implements Serializable { ...@@ -19,6 +19,11 @@ public class InList extends BasePo implements Serializable {
* 入库单名称 * 入库单名称
*/ */
private String name; private String name;
/**
*凭证号 交货单，agv任务单类型回的是物料凭证的单号
*/
private String docNo;
/** /**
* 入库单状态，0=等待，1=异常，2=OK * 入库单状态，0=等待，1=异常，2=OK
*/ */
......
src/main/java/com/neotel/smfcore/core/storage/rest/query/StoragePosFindCriteria.java
...@@ -56,15 +56,18 @@ public class StoragePosFindCriteria { ...@@ -56,15 +56,18 @@ public class StoragePosFindCriteria {
@QueryCondition(blurry = "barcode.providerNumber" ) @QueryCondition(blurry = "barcode.providerNumber" )
private String providerNumber; private String providerNumber;
@ApiModelProperty("物料编号")
@QueryCondition(blurry = "barcode.partNumber") @QueryCondition(blurry = "barcode.partNumber")
private String partNumber; private String partNumber;
@QueryCondition(blurry = "barcode.memo") @QueryCondition(blurry = "barcode.memo")
private String memo; private String memo;
@QueryCondition(propName = "barcode.lockId") @QueryCondition(propName = "barcode.lockId")
private String lockId; private String lockId;
@ApiModelProperty("批次")
@QueryCondition(blurry = "barcode.batch") @QueryCondition(blurry = "barcode.batch")
private String batch; private String batch;
@ApiModelProperty("供应商")
@QueryCondition(blurry = "barcode.provider") @QueryCondition(blurry = "barcode.provider")
private String provider; private String provider;
@QueryCondition(blurry = "barcode.otherField1") @QueryCondition(blurry = "barcode.otherField1")
......
src/main/java/com/neotel/smfcore/core/system/rest/bean/dto/TaskDto.java
...@@ -98,9 +98,8 @@ public class TaskDto implements Serializable { ...@@ -98,9 +98,8 @@ public class TaskDto implements Serializable {
* 子来源 ID(单个站位) * 子来源 ID(单个站位)
*/ */
private String subSourceId; private String subSourceId;
/**
* 子来源名称 @ApiModelProperty("子来源名称 来源二")
*/
private String subSourceInfo; private String subSourceInfo;
/** /**
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!