|
@@ -247,78 +247,6 @@ public class StockDetailServiceImpl extends ServiceImpl<StockDetailMapper, Stock
|
|
|
schedulingService.updateBatchById(schedulingList);
|
|
|
schedulingActualService.saveBatch(schedulingActualList);
|
|
|
|
|
|
-
|
|
|
-// List<Scheduling> schedulingList = appointInfoList.stream().map(item -> {
|
|
|
-//
|
|
|
-// Scheduling scheduling = new Scheduling();
|
|
|
-//
|
|
|
-// scheduling.setId(item.get("id").toString()); // id
|
|
|
-// String type = item.get("type").toString(); // 类型
|
|
|
-//
|
|
|
-// String materialCode = item.get("materialCode").toString(); // 物料编码
|
|
|
-// materialCodeList.add(materialCode);
|
|
|
-//
|
|
|
-// Object rfidCode = item.get("rfidCode"); // 推荐领料rfid
|
|
|
-// if (ObjectUtil.isNotEmpty(rfidCode)) {
|
|
|
-// SchedulingActual schedulingActual = new SchedulingActual();
|
|
|
-// schedulingActual.setMaterialCode(materialCode);
|
|
|
-// schedulingActual.setMaterialRfid(rfidCode.toString());
|
|
|
-// schedulingActual.setQuantity(BigDecimalUtil.objToBigDecimal(item.get("quantity")));
|
|
|
-// schedulingActual.setType(2);
|
|
|
-// schedulingActual.setJobNo(jobNo);
|
|
|
-// schedulingActual.setFlag(flag);
|
|
|
-// schedulingActual.setCreateTime(date);
|
|
|
-// schedulingActualList.add(schedulingActual);
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (type.equals("1")) {
|
|
|
-// scheduling.setMaterialStatus(1);
|
|
|
-// scheduling.setMaterialFlag(flag);
|
|
|
-// } else {
|
|
|
-// scheduling.setPaperStatus(1);
|
|
|
-// scheduling.setPaperFlag(flag);
|
|
|
-// }
|
|
|
-//
|
|
|
-// return scheduling;
|
|
|
-// }).collect(Collectors.toList());
|
|
|
-
|
|
|
-// schedulingService.updateBatchById(schedulingList);
|
|
|
-
|
|
|
-// for (Map<String, Object> map : actualList) {
|
|
|
-// String materialCode = map.get("materialCode").toString();
|
|
|
-// String materialRfid = map.get("materialRfid").toString();
|
|
|
-// BigDecimal quantity = BigDecimalUtil.objToBigDecimal(map.get("quantity"));
|
|
|
-//
|
|
|
-// if (!materialCodeList.contains(materialCode)) continue;
|
|
|
-//
|
|
|
-// // 是否是推荐物料标记
|
|
|
-// boolean isRecommendFlag = false;
|
|
|
-//
|
|
|
-// // 如果出库物料在推荐物料中,改变状态为推荐领料且已领取
|
|
|
-// for (SchedulingActual schedulingActual : schedulingActualList) {
|
|
|
-// if (schedulingActual.getMaterialRfid().equals(materialRfid)) {
|
|
|
-// schedulingActual.setType(1);
|
|
|
-// isRecommendFlag = true;
|
|
|
-// break;
|
|
|
-// }
|
|
|
-// }
|
|
|
-//
|
|
|
-// if (!isRecommendFlag) {
|
|
|
-// SchedulingActual schedulingActual = new SchedulingActual();
|
|
|
-// schedulingActual.setMaterialCode(materialCode);
|
|
|
-// schedulingActual.setMaterialRfid(materialRfid);
|
|
|
-// schedulingActual.setQuantity(quantity);
|
|
|
-// schedulingActual.setType(3);
|
|
|
-// schedulingActual.setJobNo(jobNo);
|
|
|
-// schedulingActual.setFlag(flag);
|
|
|
-// schedulingActual.setCreateTime(date);
|
|
|
-// schedulingActualList.add(schedulingActual);
|
|
|
-// }
|
|
|
-//
|
|
|
-// }
|
|
|
-
|
|
|
-// schedulingActualService.saveBatch(schedulingActualList);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
/**
|