|
|
|
@ -409,10 +409,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
|
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
|
|
|
|
|
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
|
|
|
|
|
} else {
|
|
|
|
|
// collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
|
// collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 2: //不插入
|
|
|
|
@ -430,10 +428,8 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
|
}
|
|
|
|
|
throw new JsonException(500, collectOrderBiz.getCpmctymc() + "扫码数量超出!");
|
|
|
|
|
}
|
|
|
|
|
// collectOrderBiz.setScanCount(count);
|
|
|
|
|
// collectOrderBiz.setScanActCount(actCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(count);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(actCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
|
|
break;
|
|
|
|
|
case 3: //提醒是否插入
|
|
|
|
|
|
|
|
|
@ -461,26 +457,21 @@ public class IoCollectOrderCodeManService extends ServiceImpl<IoCollectOrderCode
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
// collectOrderBiz.setScanCount(count1);
|
|
|
|
|
// collectOrderBiz.setScanActCount(actCount1);
|
|
|
|
|
collectOrderBiz.setAddScanCount(count1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(actCount1);
|
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
|
|
} else {
|
|
|
|
|
if (collectOrderBiz == null) {
|
|
|
|
|
collectOrderBiz = scanGenOrder(udiRelevanceResponses, collectOrderBizs, udiEntity, collectOrder);
|
|
|
|
|
collectOrderBiz.setOrderIdFk(collectOrder.getBillNo());
|
|
|
|
|
} else {
|
|
|
|
|
// collectOrderBiz.setScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
|
// collectOrderBiz.setScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(IntUtil.value(collectOrderBiz.getScanCount()) + 1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(IntUtil.value(collectOrderBiz.getScanActCount()) + scanCount);
|
|
|
|
|
collectOrderBiz.setAddScanCount(1);
|
|
|
|
|
collectOrderBiz.setAddScanActCount(scanCount);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
// collectOrderBiz.setAddScanCount(1);
|
|
|
|
|
collectOrderBizService.insertOrUpdate(collectOrderBiz);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|