入库任务 手动完成
This commit is contained in:
@@ -313,13 +313,13 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
|||||||
if (CollUtil.isNotEmpty(mydoJobDetails)) {
|
if (CollUtil.isNotEmpty(mydoJobDetails)) {
|
||||||
List<BasStock> list = new ArrayList<>();
|
List<BasStock> list = new ArrayList<>();
|
||||||
for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
|
for (MydoJobDetail mydoJobDetail : mydoJobDetails) {
|
||||||
if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
|
//if ("2".equals(mydoJob.getInOrOut()) || "3".equals(mydoJob.getInOrOut())) {
|
||||||
//修改单据实际数量 2-退料入库 3-其它入库
|
//修改单据实际数量
|
||||||
String inOrOutDId = mydoJobDetail.getInOrOutDId();
|
String inOrOutDId = mydoJobDetail.getInOrOutDId();
|
||||||
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
|
InStockinDetail inStockinDetail = inStockinDetailService.selectInStockinDetailByStockinDetailId(inOrOutDId);
|
||||||
inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
|
inStockinDetail.setAssignNum(Convert.toStr(Convert.toBigDecimal(inStockinDetail.getAssignNum()).add(Convert.toBigDecimal(mydoJobDetail.getInQuantity()))));
|
||||||
inStockinDetailService.updateInStockinDetail(inStockinDetail);
|
inStockinDetailService.updateInStockinDetail(inStockinDetail);
|
||||||
}
|
//}
|
||||||
//正常库存
|
//正常库存
|
||||||
BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
|
BasStock stockByInStockinDetail = getStockByInStockinDetail(mydoJobDetail, mydoJob, "1");
|
||||||
stockByInStockinDetail.setSpare7("0");
|
stockByInStockinDetail.setSpare7("0");
|
||||||
@@ -367,35 +367,35 @@ public class MydoJobServiceImpl implements IMydoJobService {
|
|||||||
stock.setStockId(basJobIdService.getJobId("KC"));
|
stock.setStockId(basJobIdService.getJobId("KC"));
|
||||||
stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
|
stock.setCargoSpaceId(mydoJob.getCargoSpaceId());
|
||||||
stock.setStockStatus("1");
|
stock.setStockStatus("1");
|
||||||
|
stock.setOutQuantity("0");
|
||||||
stock.setProductStatus(productStatus);
|
stock.setProductStatus(productStatus);
|
||||||
stock.setLotNo(mydoJobDetail.getLotNo());
|
stock.setLotNo(mydoJobDetail.getLotNo());
|
||||||
stock.setInDate(DateUtils.getTime());
|
stock.setInDate(DateUtil.formatDateTime(new Date()));
|
||||||
stock.setProductGuid(mydoJobDetail.getProductGuid());
|
stock.setProductGuid(mydoJobDetail.getProductGuid());
|
||||||
stock.setQuantity(mydoJobDetail.getInQuantity());
|
stock.setQuantity(mydoJobDetail.getInQuantity());
|
||||||
stock.setJobId(mydoJob.getJobId());
|
stock.setJobId(mydoJob.getJobId());
|
||||||
stock.setTrayCode(mydoJob.getTrayCode());
|
stock.setTrayCode(mydoJob.getTrayCode());
|
||||||
stock.setWarehouseId(mydoJob.getWarehouseId());
|
stock.setWarehouseId(mydoJob.getWarehouseId());
|
||||||
stock.setOutQuantity("0");
|
|
||||||
stock.setProductId(mydoJobDetail.getProductId());
|
stock.setProductId(mydoJobDetail.getProductId());
|
||||||
stock.setStockinId(mydoJobDetail.getInOrOutId());
|
stock.setStockinId(mydoJobDetail.getInOrOutId());
|
||||||
stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
|
stock.setStockinDetailId(mydoJobDetail.getInOrOutDId());
|
||||||
stock.setInType(mydoJob.getInOrOut());
|
stock.setInType(mydoJob.getInOrOut());
|
||||||
stock.setSpare1(mydoJobDetail.getSpec());
|
stock.setLotNo(mydoJobDetail.getLotNo());
|
||||||
stock.setSpare4(mydoJobDetail.getSpare1());
|
|
||||||
stock.setSpare5(mydoJobDetail.getSpare3());
|
|
||||||
stock.setSpare6(mydoJobDetail.getSpare4());
|
|
||||||
stock.setProductName(mydoJobDetail.getProductName());
|
stock.setProductName(mydoJobDetail.getProductName());
|
||||||
stock.setVoltage(mydoJobDetail.getSpare5());
|
stock.setSpare1(mydoJobDetail.getSpare1());
|
||||||
stock.setPower(mydoJobDetail.getSpare6());
|
stock.setSpare3(mydoJobDetail.getSpare3());
|
||||||
stock.setPhase(mydoJobDetail.getSpare7());
|
stock.setSpare4(mydoJobDetail.getSpare4());
|
||||||
stock.setNetWeight(mydoJobDetail.getSpare2());
|
stock.setSpare5(mydoJobDetail.getSpare5());
|
||||||
stock.setGrossWeight(mydoJobDetail.getSpare8());
|
stock.setSpare6(mydoJobDetail.getPrintDate());
|
||||||
|
stock.setSpare8(mydoJobDetail.getSpare8());
|
||||||
|
stock.setVoltage(mydoJobDetail.getSpare2());
|
||||||
|
stock.setPower(mydoJobDetail.getSpare7());
|
||||||
|
stock.setPhase(mydoJobDetail.getSupplierId());
|
||||||
|
stock.setNetWeight(mydoJobDetail.getSpec());
|
||||||
|
stock.setGrossWeight(mydoJobDetail.getStackingId());
|
||||||
stock.setDistribution(mydoJobDetail.getSpare9());
|
stock.setDistribution(mydoJobDetail.getSpare9());
|
||||||
stock.setModel(mydoJobDetail.getUnit());
|
stock.setModel(mydoJobDetail.getUnit());
|
||||||
stock.setOrderId(mydoJob.getLineId());
|
stock.setOrderId(mydoJobDetail.getSpare6());
|
||||||
stock.setLotNo(mydoJobDetail.getLotNo());
|
|
||||||
stock.setWarehouseId(mydoJob.getWarehouseId());
|
|
||||||
stock.setSpare3(mydoJobDetail.getSupplierId());
|
|
||||||
return stock;
|
return stock;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user