Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 95deb08c 由 zshaohui
选项

1.UID出库导出修改 

2.pk列表排序
1 个父辈 90cd18ad
内嵌 并排
正在显示 5 个修改的文件 包含 66 行增加 和 39 行删除
src/main/java/com/neotel/smfcore/core/barcode/service/po/Barcode.java
...@@ -619,7 +619,7 @@ public class Barcode extends BasePo implements Serializable { ...@@ -619,7 +619,7 @@ public class Barcode extends BasePo implements Serializable {
return null; return null;
} }
public synchronized void UpdateSubCode(Barcode barcode) { public void UpdateSubCode(Barcode barcode) {
if (subCodeList == null) { if (subCodeList == null) {
subCodeList = Lists.newArrayList(); subCodeList = Lists.newArrayList();
...@@ -644,7 +644,7 @@ public class Barcode extends BasePo implements Serializable { ...@@ -644,7 +644,7 @@ public class Barcode extends BasePo implements Serializable {
} }
} }
public synchronized void removeFromSubCodes(Barcode subCode){ public void removeFromSubCodes(Barcode subCode){
if(subCodeList != null && subCodeList.size() > 0){ if(subCodeList != null && subCodeList.size() > 0){
boolean removeOk = subCodeList.removeIf(t -> t.getBarcode().equals(subCode.getBarcode())); boolean removeOk = subCodeList.removeIf(t -> t.getBarcode().equals(subCode.getBarcode()));
if(removeOk){ if(removeOk){
......
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -1020,12 +1020,15 @@ public class LiteOrderCache { ...@@ -1020,12 +1020,15 @@ public class LiteOrderCache {
} }
} }
try { try {
Thread.sleep(10);
smfApi.canPutInAfterResolve(subCode); smfApi.canPutInAfterResolve(subCode);
} catch (ValidateException e) { } catch (ValidateException e) {
e.printStackTrace(); e.printStackTrace();
log.info(subCode.getBarcode()+"为禁用料,库位为:"+subCode.getPosName()); log.info(subCode.getBarcode()+"为禁用料,库位为:"+subCode.getPosName());
disablePosNameList.add(subCode.getPosName()); disablePosNameList.add(subCode.getPosName());
continue; continue;
} catch (InterruptedException ex){
log.info("休眠10毫秒失败:"+ex.getMessage());
} }
if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){ if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){
......
src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java
...@@ -34,6 +34,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos; ...@@ -34,6 +34,7 @@ import com.neotel.smfcore.core.storage.service.po.StoragePos;
import com.neotel.smfcore.core.system.service.po.DataLog; import com.neotel.smfcore.core.system.service.po.DataLog;
import com.neotel.smfcore.core.system.util.TaskService; import com.neotel.smfcore.core.system.util.TaskService;
import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType; import com.neotel.smfcore.custom.lizhen.innerBox.enums.ExtendType;
import com.neotel.smfcore.custom.luxsan.factory_c.common.util.DisableBarcodeUtil;
import com.neotel.smfcore.custom.siemens.SiemensApi; import com.neotel.smfcore.custom.siemens.SiemensApi;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
...@@ -668,19 +669,20 @@ public class StoragePosController { ...@@ -668,19 +669,20 @@ public class StoragePosController {
@Override @Override
public List<List<String>> getHeader() { public List<List<String>> getHeader() {
List<List<String>> header = new ArrayList<>(); List<List<String>> header = new ArrayList<>();
Locale locale = request.getLocale(); header.add(Arrays.asList("条码编号"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.barcode",locale,"条码编号"))); header.add(Arrays.asList("labelId"));
header.add(Lists.newArrayList(MessageUtils.getText("",locale,"栈板id"))); header.add(Arrays.asList("料号"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.partNumber",locale,"物料编号"))); header.add(Arrays.asList("库别"));
header.add(Arrays.asList("状态")); header.add(Arrays.asList("批次"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.proDate",locale,"生产日期"))); header.add(Arrays.asList("供应商"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.expireDate",locale,"过期时间"))); header.add(Arrays.asList("隔口号"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.posName",locale,"库位号"))); header.add(Arrays.asList("DC"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.lockName",locale,"工单号"))); header.add(Arrays.asList("首次入库时间"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.amount",locale,"数量"))); header.add(Arrays.asList("入库时间"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInTime",locale,"首次入库时间"))); header.add(Arrays.asList("所属料箱"));
header.add(Lists.newArrayList(MessageUtils.getText("smfcore.storagePos.putInDate",locale,"入库时间"))); header.add(Arrays.asList("料箱所属架位"));
header.add(Arrays.asList("料箱是否在库"));
header.add(Arrays.asList("是否禁用"));
return header; return header;
} }
...@@ -688,37 +690,57 @@ public class StoragePosController { ...@@ -688,37 +690,57 @@ public class StoragePosController {
public List<List<Object>> getPageData(Query query, Pageable pageable) { public List<List<Object>> getPageData(Query query, Pageable pageable) {
List<List<Object>> dataList = new ArrayList<>(); List<List<Object>> dataList = new ArrayList<>();
DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
List<Map<String, Object>> list = new ArrayList<>();
List<StoragePos> storagePos = storagePosManager.findByQuery(query,pageable); List<StoragePos> storagePos = storagePosManager.findByQuery(query,pageable);
for (StoragePos pos : storagePos) { for (StoragePos pos : storagePos) {
String proDate = pos.getBarcode().getProduceDate() == null ? "" : dateFormat.format(pos.getBarcode().getProduceDate()); Barcode barcode = pos.getBarcode();
String expireDate = pos.getBarcode().getExpireDate() == null ? "" : dateFormat.format(pos.getBarcode().getExpireDate()); List<Barcode> subCodeList = barcode.getSubCodeList();
if (subCodeList != null && !subCodeList.isEmpty()){
for (Barcode subCode : subCodeList) {
List<Object> data = new ArrayList<>();
data.add(subCode.getBarcode());
data.add(subCode.getLabelId());
data.add(subCode.getPartNumber());
data.add(subCode.getWarehouseCode());
data.add(subCode.getBatch());
data.add(subCode.getProvider());
data.add(subCode.getPosName());
data.add(subCode.getDateCode());
long putInTime = subCode.getPutInTime();
if (putInTime != -1){
data.add(dateFormat.format(putInTime));
} else {
data.add("");
}
String putInTime = (pos.getBarcode().getPutInTime() == -1) ? "" : dateFormat.format(new Date(pos.getBarcode().getPutInTime())); Date putInDate = subCode.getPutInDate();
if(ObjectUtil.isEmpty(putInTime)){ if (putInDate != null){
putInTime=dateFormat.format(pos.getBarcode().getCreateDate()); data.add(dateFormat.format(putInDate));
} } else {
data.add("");
}
List<Object> data = new ArrayList<>(); data.add(barcode.getBarcode());
data.add(pos.getBarcode().getBarcode()); data.add(barcode.getPosName());
data.add(pos.getBarcode().getPalletId());
data.add(pos.getBarcode().getPartNumber());
String statusStr = ""; int status = barcode.getStatus();
if (pos.getBarcode().getStatus() == BARCODE_STATUS.IN_STORE){ if (status == BARCODE_STATUS.IN_STORE){
statusStr = "在库"; data.add("在库");
} } else {
data.add("");
}
if (DisableBarcodeUtil.isDisable(subCode.getBarcode())){
data.add("是");
} else {
data.add("");
}
data.add(statusStr); dataList.add(data);
data.add(proDate); }
data.add(expireDate); }
data.add(pos.getPosName());
data.add(pos.getBarcode().getLockName());
data.add(pos.getBarcode().getAmount());
data.add(putInTime);
data.add("");
dataList.add(data);
} }
return dataList; return dataList;
} }
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/CDeviceController.java
...@@ -911,6 +911,7 @@ public class CDeviceController { ...@@ -911,6 +911,7 @@ public class CDeviceController {
} }
@Deprecated
@ApiOperation("物料放入料格，完成入库任务") @ApiOperation("物料放入料格，完成入库任务")
@RequestMapping("/finishedReelToBox") @RequestMapping("/finishedReelToBox")
@AnonymousAccess @AnonymousAccess
......
src/main/java/com/neotel/smfcore/custom/luxsan/factory_c/rawstor/controller/PkCheckOutController.java
...@@ -82,6 +82,7 @@ public class PkCheckOutController { ...@@ -82,6 +82,7 @@ public class PkCheckOutController {
} }
} }
} }
pickingResultList = pickingResultList.stream().sorted(Comparator.comparing(QueryPickingResult :: getCREATE_AT)).collect(Collectors.toList());
return ResultBean.newOkResult(QueryPickingDto.convertQueryPickingResultDto(pickingResultList)); return ResultBean.newOkResult(QueryPickingDto.convertQueryPickingResultDto(pickingResultList));
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!